From 860632715e8bfbe4bbdb30894069f5159158a33a Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 30 May 2024 08:15:59 -0700 Subject: [PATCH 001/168] [processorhelper] use mdatagen level and noop meter (#10235) This cleans up the need to have a level in the ObsReport struct. Added test to validate the change as none existed before --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- processor/processorhelper/obsreport.go | 42 ++++---------- processor/processorhelper/obsreport_test.go | 62 +++++++++++++++++++++ 2 files changed, 72 insertions(+), 32 deletions(-) diff --git a/processor/processorhelper/obsreport.go b/processor/processorhelper/obsreport.go index 2e074713f87..51aa26a9a88 100644 --- a/processor/processorhelper/obsreport.go +++ b/processor/processorhelper/obsreport.go @@ -12,7 +12,6 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics" "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/processor/processorhelper/internal/metadata" @@ -34,8 +33,6 @@ func BuildCustomMetricName(configType, metric string) string { // ObsReport is a helper to add observability to a processor. type ObsReport struct { - level configtelemetry.Level - logger *zap.Logger otelAttrs []attribute.KeyValue @@ -54,12 +51,11 @@ func NewObsReport(cfg ObsReportSettings) (*ObsReport, error) { } func newObsReport(cfg ObsReportSettings) (*ObsReport, error) { - telemetryBuilder, err := metadata.NewTelemetryBuilder(cfg.ProcessorCreateSettings.TelemetrySettings) + telemetryBuilder, err := metadata.NewTelemetryBuilder(cfg.ProcessorCreateSettings.TelemetrySettings, metadata.WithLevel(cfg.ProcessorCreateSettings.MetricsLevel)) if err != nil { return nil, err } return &ObsReport{ - level: cfg.ProcessorCreateSettings.MetricsLevel, logger: cfg.ProcessorCreateSettings.Logger, otelAttrs: []attribute.KeyValue{ attribute.String(obsmetrics.ProcessorKey, cfg.ProcessorID.String()), @@ -92,63 +88,45 @@ func (or *ObsReport) recordData(ctx context.Context, dataType component.DataType // TracesAccepted reports that the trace data was accepted. func (or *ObsReport) TracesAccepted(ctx context.Context, numSpans int) { - if or.level != configtelemetry.LevelNone { - or.recordData(ctx, component.DataTypeTraces, int64(numSpans), int64(0), int64(0)) - } + or.recordData(ctx, component.DataTypeTraces, int64(numSpans), int64(0), int64(0)) } // TracesRefused reports that the trace data was refused. func (or *ObsReport) TracesRefused(ctx context.Context, numSpans int) { - if or.level != configtelemetry.LevelNone { - or.recordData(ctx, component.DataTypeTraces, int64(0), int64(numSpans), int64(0)) - } + or.recordData(ctx, component.DataTypeTraces, int64(0), int64(numSpans), int64(0)) } // TracesDropped reports that the trace data was dropped. func (or *ObsReport) TracesDropped(ctx context.Context, numSpans int) { - if or.level != configtelemetry.LevelNone { - or.recordData(ctx, component.DataTypeTraces, int64(0), int64(0), int64(numSpans)) - } + or.recordData(ctx, component.DataTypeTraces, int64(0), int64(0), int64(numSpans)) } // MetricsAccepted reports that the metrics were accepted. func (or *ObsReport) MetricsAccepted(ctx context.Context, numPoints int) { - if or.level != configtelemetry.LevelNone { - or.recordData(ctx, component.DataTypeMetrics, int64(numPoints), int64(0), int64(0)) - } + or.recordData(ctx, component.DataTypeMetrics, int64(numPoints), int64(0), int64(0)) } // MetricsRefused reports that the metrics were refused. func (or *ObsReport) MetricsRefused(ctx context.Context, numPoints int) { - if or.level != configtelemetry.LevelNone { - or.recordData(ctx, component.DataTypeMetrics, int64(0), int64(numPoints), int64(0)) - } + or.recordData(ctx, component.DataTypeMetrics, int64(0), int64(numPoints), int64(0)) } // MetricsDropped reports that the metrics were dropped. func (or *ObsReport) MetricsDropped(ctx context.Context, numPoints int) { - if or.level != configtelemetry.LevelNone { - or.recordData(ctx, component.DataTypeMetrics, int64(0), int64(0), int64(numPoints)) - } + or.recordData(ctx, component.DataTypeMetrics, int64(0), int64(0), int64(numPoints)) } // LogsAccepted reports that the logs were accepted. func (or *ObsReport) LogsAccepted(ctx context.Context, numRecords int) { - if or.level != configtelemetry.LevelNone { - or.recordData(ctx, component.DataTypeLogs, int64(numRecords), int64(0), int64(0)) - } + or.recordData(ctx, component.DataTypeLogs, int64(numRecords), int64(0), int64(0)) } // LogsRefused reports that the logs were refused. func (or *ObsReport) LogsRefused(ctx context.Context, numRecords int) { - if or.level != configtelemetry.LevelNone { - or.recordData(ctx, component.DataTypeLogs, int64(0), int64(numRecords), int64(0)) - } + or.recordData(ctx, component.DataTypeLogs, int64(0), int64(numRecords), int64(0)) } // LogsDropped reports that the logs were dropped. func (or *ObsReport) LogsDropped(ctx context.Context, numRecords int) { - if or.level != configtelemetry.LevelNone { - or.recordData(ctx, component.DataTypeLogs, int64(0), int64(0), int64(numRecords)) - } + or.recordData(ctx, component.DataTypeLogs, int64(0), int64(0), int64(numRecords)) } diff --git a/processor/processorhelper/obsreport_test.go b/processor/processorhelper/obsreport_test.go index f9df6456e08..d9313234874 100644 --- a/processor/processorhelper/obsreport_test.go +++ b/processor/processorhelper/obsreport_test.go @@ -12,6 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/processor" ) @@ -172,6 +173,67 @@ func TestCheckProcessorLogViews(t *testing.T) { assert.Error(t, tt.CheckProcessorLogs(0, 0, 9)) } +func TestNoMetrics(t *testing.T) { + // ensure if LevelNone is configured, no metrics are emitted by the component + testTelemetry(t, processorID, func(t *testing.T, tt componenttest.TestTelemetry) { + const accepted = 29 + const refused = 11 + const dropped = 17 + set := tt.TelemetrySettings() + set.MetricsLevel = configtelemetry.LevelNone + + por, err := NewObsReport(ObsReportSettings{ + ProcessorID: processorID, + ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: set, BuildInfo: component.NewDefaultBuildInfo()}, + }) + assert.NoError(t, err) + + por.TracesAccepted(context.Background(), accepted) + por.TracesRefused(context.Background(), refused) + por.TracesDropped(context.Background(), dropped) + + require.Error(t, tt.CheckProcessorTraces(accepted, refused, dropped)) + }) + testTelemetry(t, processorID, func(t *testing.T, tt componenttest.TestTelemetry) { + const accepted = 29 + const refused = 11 + const dropped = 17 + set := tt.TelemetrySettings() + set.MetricsLevel = configtelemetry.LevelNone + + por, err := NewObsReport(ObsReportSettings{ + ProcessorID: processorID, + ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: set, BuildInfo: component.NewDefaultBuildInfo()}, + }) + assert.NoError(t, err) + + por.MetricsAccepted(context.Background(), accepted) + por.MetricsRefused(context.Background(), refused) + por.MetricsDropped(context.Background(), dropped) + + require.Error(t, tt.CheckProcessorMetrics(accepted, refused, dropped)) + }) + testTelemetry(t, processorID, func(t *testing.T, tt componenttest.TestTelemetry) { + const accepted = 29 + const refused = 11 + const dropped = 17 + set := tt.TelemetrySettings() + set.MetricsLevel = configtelemetry.LevelNone + + por, err := NewObsReport(ObsReportSettings{ + ProcessorID: processorID, + ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: set, BuildInfo: component.NewDefaultBuildInfo()}, + }) + assert.NoError(t, err) + + por.LogsAccepted(context.Background(), accepted) + por.LogsRefused(context.Background(), refused) + por.LogsDropped(context.Background(), dropped) + + require.Error(t, tt.CheckProcessorLogs(accepted, refused, dropped)) + }) +} + func testTelemetry(t *testing.T, id component.ID, testFunc func(t *testing.T, tt componenttest.TestTelemetry)) { tt, err := componenttest.SetupTelemetry(id) require.NoError(t, err) From 97c714e8b8fe2a6f66ef72ac3a72049b545df235 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Thu, 30 May 2024 09:30:38 -0700 Subject: [PATCH 002/168] [chore] Remove debug line from a test (#10261) --- exporter/exporterhelper/batch_sender_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/exporter/exporterhelper/batch_sender_test.go b/exporter/exporterhelper/batch_sender_test.go index bc5720a99f8..68396ed7c58 100644 --- a/exporter/exporterhelper/batch_sender_test.go +++ b/exporter/exporterhelper/batch_sender_test.go @@ -6,7 +6,6 @@ package exporterhelper // import "go.opentelemetry.io/collector/exporter/exporte import ( "context" "errors" - "fmt" "sync" "testing" "time" @@ -181,8 +180,6 @@ func TestBatchSender_MergeOrSplit(t *testing.T) { assert.Eventually(t, func() bool { return sink.requestsCount.Load() == 5 && sink.itemsCount.Load() == 38 }, 50*time.Millisecond, 10*time.Millisecond) - - fmt.Println("TestBatchSender_MergeOrSplit") } func TestBatchSender_Shutdown(t *testing.T) { From 10bcef33e6d26104036ed2874cb179c4437abc98 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 30 May 2024 09:40:47 -0700 Subject: [PATCH 003/168] [chore] use mdatagen to generate service metrics (#10160) This PR follows https://github.com/open-telemetry/opentelemetry-collector/pull/10159 and uses the new mdatagen functionality to generate async metrics in the service. --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- service/documentation.md | 55 +++++++ service/generated_package_test.go | 13 ++ .../internal/metadata/generated_telemetry.go | 155 ++++++++++++++++++ .../metadata/generated_telemetry_test.go | 76 +++++++++ .../proctelemetry/process_telemetry.go | 94 ++--------- .../process_telemetry_linux_test.go | 2 +- .../proctelemetry/process_telemetry_test.go | 9 +- service/metadata.yaml | 68 ++++++++ service/service.go | 4 +- 9 files changed, 388 insertions(+), 88 deletions(-) create mode 100644 service/documentation.md create mode 100644 service/generated_package_test.go create mode 100644 service/internal/metadata/generated_telemetry.go create mode 100644 service/internal/metadata/generated_telemetry_test.go create mode 100644 service/metadata.yaml diff --git a/service/documentation.md b/service/documentation.md new file mode 100644 index 00000000000..2cbd48a0708 --- /dev/null +++ b/service/documentation.md @@ -0,0 +1,55 @@ +[comment]: <> (Code generated by mdatagen. DO NOT EDIT.) + +# service + +## Internal Telemetry + +The following telemetry is emitted by this component. + +### process_cpu_seconds + +Total CPU user and system time in seconds + +| Unit | Metric Type | Value Type | Monotonic | +| ---- | ----------- | ---------- | --------- | +| s | Sum | Double | true | + +### process_memory_rss + +Total physical memory (resident set size) + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| By | Gauge | Int | + +### process_runtime_heap_alloc_bytes + +Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| By | Gauge | Int | + +### process_runtime_total_alloc_bytes + +Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') + +| Unit | Metric Type | Value Type | Monotonic | +| ---- | ----------- | ---------- | --------- | +| By | Sum | Int | true | + +### process_runtime_total_sys_memory_bytes + +Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| By | Gauge | Int | + +### process_uptime + +Uptime of the process + +| Unit | Metric Type | Value Type | Monotonic | +| ---- | ----------- | ---------- | --------- | +| s | Sum | Double | true | diff --git a/service/generated_package_test.go b/service/generated_package_test.go new file mode 100644 index 00000000000..545b6bb0c5e --- /dev/null +++ b/service/generated_package_test.go @@ -0,0 +1,13 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package service + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), goleak.IgnoreTopFunction("go.opentelemetry.io/collector/service/internal/proctelemetry.InitPrometheusServer.func1")) +} diff --git a/service/internal/metadata/generated_telemetry.go b/service/internal/metadata/generated_telemetry.go new file mode 100644 index 00000000000..3d1c7b37a04 --- /dev/null +++ b/service/internal/metadata/generated_telemetry.go @@ -0,0 +1,155 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "context" + "errors" + + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" + + "go.opentelemetry.io/collector/component" +) + +func Meter(settings component.TelemetrySettings) metric.Meter { + return settings.MeterProvider.Meter("go.opentelemetry.io/collector/service") +} + +func Tracer(settings component.TelemetrySettings) trace.Tracer { + return settings.TracerProvider.Tracer("go.opentelemetry.io/collector/service") +} + +// TelemetryBuilder provides an interface for components to report telemetry +// as defined in metadata and user config. +type TelemetryBuilder struct { + ProcessCPUSeconds metric.Float64ObservableCounter + observeProcessCPUSeconds func() float64 + ProcessMemoryRss metric.Int64ObservableGauge + observeProcessMemoryRss func() int64 + ProcessRuntimeHeapAllocBytes metric.Int64ObservableGauge + observeProcessRuntimeHeapAllocBytes func() int64 + ProcessRuntimeTotalAllocBytes metric.Int64ObservableCounter + observeProcessRuntimeTotalAllocBytes func() int64 + ProcessRuntimeTotalSysMemoryBytes metric.Int64ObservableGauge + observeProcessRuntimeTotalSysMemoryBytes func() int64 + ProcessUptime metric.Float64ObservableCounter + observeProcessUptime func() float64 +} + +// telemetryBuilderOption applies changes to default builder. +type telemetryBuilderOption func(*TelemetryBuilder) + +// WithProcessCPUSecondsCallback sets callback for observable ProcessCPUSeconds metric. +func WithProcessCPUSecondsCallback(cb func() float64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessCPUSeconds = cb + } +} + +// WithProcessMemoryRssCallback sets callback for observable ProcessMemoryRss metric. +func WithProcessMemoryRssCallback(cb func() int64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessMemoryRss = cb + } +} + +// WithProcessRuntimeHeapAllocBytesCallback sets callback for observable ProcessRuntimeHeapAllocBytes metric. +func WithProcessRuntimeHeapAllocBytesCallback(cb func() int64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessRuntimeHeapAllocBytes = cb + } +} + +// WithProcessRuntimeTotalAllocBytesCallback sets callback for observable ProcessRuntimeTotalAllocBytes metric. +func WithProcessRuntimeTotalAllocBytesCallback(cb func() int64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessRuntimeTotalAllocBytes = cb + } +} + +// WithProcessRuntimeTotalSysMemoryBytesCallback sets callback for observable ProcessRuntimeTotalSysMemoryBytes metric. +func WithProcessRuntimeTotalSysMemoryBytesCallback(cb func() int64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessRuntimeTotalSysMemoryBytes = cb + } +} + +// WithProcessUptimeCallback sets callback for observable ProcessUptime metric. +func WithProcessUptimeCallback(cb func() float64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessUptime = cb + } +} + +// NewTelemetryBuilder provides a struct with methods to update all internal telemetry +// for a component +func NewTelemetryBuilder(settings component.TelemetrySettings, options ...telemetryBuilderOption) (*TelemetryBuilder, error) { + builder := TelemetryBuilder{} + for _, op := range options { + op(&builder) + } + var err, errs error + meter := Meter(settings) + builder.ProcessCPUSeconds, err = meter.Float64ObservableCounter( + "process_cpu_seconds", + metric.WithDescription("Total CPU user and system time in seconds"), + metric.WithUnit("s"), + metric.WithFloat64Callback(func(_ context.Context, o metric.Float64Observer) error { + o.Observe(builder.observeProcessCPUSeconds()) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessMemoryRss, err = meter.Int64ObservableGauge( + "process_memory_rss", + metric.WithDescription("Total physical memory (resident set size)"), + metric.WithUnit("By"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(builder.observeProcessMemoryRss()) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessRuntimeHeapAllocBytes, err = meter.Int64ObservableGauge( + "process_runtime_heap_alloc_bytes", + metric.WithDescription("Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc')"), + metric.WithUnit("By"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(builder.observeProcessRuntimeHeapAllocBytes()) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessRuntimeTotalAllocBytes, err = meter.Int64ObservableCounter( + "process_runtime_total_alloc_bytes", + metric.WithDescription("Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')"), + metric.WithUnit("By"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(builder.observeProcessRuntimeTotalAllocBytes()) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessRuntimeTotalSysMemoryBytes, err = meter.Int64ObservableGauge( + "process_runtime_total_sys_memory_bytes", + metric.WithDescription("Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys')"), + metric.WithUnit("By"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(builder.observeProcessRuntimeTotalSysMemoryBytes()) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessUptime, err = meter.Float64ObservableCounter( + "process_uptime", + metric.WithDescription("Uptime of the process"), + metric.WithUnit("s"), + metric.WithFloat64Callback(func(_ context.Context, o metric.Float64Observer) error { + o.Observe(builder.observeProcessUptime()) + return nil + }), + ) + errs = errors.Join(errs, err) + return &builder, errs +} diff --git a/service/internal/metadata/generated_telemetry_test.go b/service/internal/metadata/generated_telemetry_test.go new file mode 100644 index 00000000000..5e225295ba3 --- /dev/null +++ b/service/internal/metadata/generated_telemetry_test.go @@ -0,0 +1,76 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel/metric" + embeddedmetric "go.opentelemetry.io/otel/metric/embedded" + noopmetric "go.opentelemetry.io/otel/metric/noop" + "go.opentelemetry.io/otel/trace" + embeddedtrace "go.opentelemetry.io/otel/trace/embedded" + nooptrace "go.opentelemetry.io/otel/trace/noop" + + "go.opentelemetry.io/collector/component" +) + +type mockMeter struct { + noopmetric.Meter + name string +} +type mockMeterProvider struct { + embeddedmetric.MeterProvider +} + +func (m mockMeterProvider) Meter(name string, opts ...metric.MeterOption) metric.Meter { + return mockMeter{name: name} +} + +type mockTracer struct { + nooptrace.Tracer + name string +} + +type mockTracerProvider struct { + embeddedtrace.TracerProvider +} + +func (m mockTracerProvider) Tracer(name string, opts ...trace.TracerOption) trace.Tracer { + return mockTracer{name: name} +} + +func TestProviders(t *testing.T) { + set := component.TelemetrySettings{ + MeterProvider: mockMeterProvider{}, + TracerProvider: mockTracerProvider{}, + } + + meter := Meter(set) + if m, ok := meter.(mockMeter); ok { + require.Equal(t, "go.opentelemetry.io/collector/service", m.name) + } else { + require.Fail(t, "returned Meter not mockMeter") + } + + tracer := Tracer(set) + if m, ok := tracer.(mockTracer); ok { + require.Equal(t, "go.opentelemetry.io/collector/service", m.name) + } else { + require.Fail(t, "returned Meter not mockTracer") + } +} + +func TestNewTelemetryBuilder(t *testing.T) { + set := component.TelemetrySettings{ + MeterProvider: mockMeterProvider{}, + TracerProvider: mockTracerProvider{}, + } + applied := false + _, err := NewTelemetryBuilder(set, func(b *TelemetryBuilder) { + applied = true + }) + require.NoError(t, err) + require.True(t, applied) +} diff --git a/service/internal/proctelemetry/process_telemetry.go b/service/internal/proctelemetry/process_telemetry.go index 991897f8b1b..9f8f0874e97 100644 --- a/service/internal/proctelemetry/process_telemetry.go +++ b/service/internal/proctelemetry/process_telemetry.go @@ -12,13 +12,10 @@ import ( "github.com/shirou/gopsutil/v3/common" "github.com/shirou/gopsutil/v3/process" - otelmetric "go.opentelemetry.io/otel/metric" - "go.uber.org/multierr" -) -const ( - scopeName = "go.opentelemetry.io/collector/service/process_telemetry" - processNameKey = "process_name" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/service/internal/metadata" + "go.opentelemetry.io/collector/service/internal/servicetelemetry" ) // processMetrics is a struct that contains views related to process metrics (cpu, mem, etc) @@ -28,13 +25,6 @@ type processMetrics struct { proc *process.Process context context.Context - otelProcessUptime otelmetric.Float64ObservableCounter - otelAllocMem otelmetric.Int64ObservableGauge - otelTotalAllocMem otelmetric.Int64ObservableCounter - otelSysMem otelmetric.Int64ObservableGauge - otelCPUSeconds otelmetric.Float64ObservableCounter - otelRSSMemory otelmetric.Int64ObservableGauge - // mu protects everything bellow. mu sync.Mutex lastMsRead time.Time @@ -64,7 +54,7 @@ func WithHostProc(hostProc string) RegisterOption { // RegisterProcessMetrics creates a new set of processMetrics (mem, cpu) that can be used to measure // basic information about this process. -func RegisterProcessMetrics(mp otelmetric.MeterProvider, ballastSizeBytes uint64, opts ...RegisterOption) error { +func RegisterProcessMetrics(cfg servicetelemetry.TelemetrySettings, ballastSizeBytes uint64, opts ...RegisterOption) error { set := registerOption{} for _, opt := range opts { opt.apply(&set) @@ -86,73 +76,15 @@ func RegisterProcessMetrics(mp otelmetric.MeterProvider, ballastSizeBytes uint64 return err } - return pm.record(mp.Meter(scopeName)) -} - -func (pm *processMetrics) record(meter otelmetric.Meter) error { - var errs, err error - - pm.otelProcessUptime, err = meter.Float64ObservableCounter( - "process_uptime", - otelmetric.WithDescription("Uptime of the process"), - otelmetric.WithUnit("s"), - otelmetric.WithFloat64Callback(func(_ context.Context, o otelmetric.Float64Observer) error { - o.Observe(pm.updateProcessUptime()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelAllocMem, err = meter.Int64ObservableGauge( - "process_runtime_heap_alloc_bytes", - otelmetric.WithDescription("Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc')"), - otelmetric.WithUnit("By"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(pm.updateAllocMem()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelTotalAllocMem, err = meter.Int64ObservableCounter( - "process_runtime_total_alloc_bytes", - otelmetric.WithDescription("Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')"), - otelmetric.WithUnit("By"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(pm.updateTotalAllocMem()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelSysMem, err = meter.Int64ObservableGauge( - "process_runtime_total_sys_memory_bytes", - otelmetric.WithDescription("Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys')"), - otelmetric.WithUnit("By"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(pm.updateSysMem()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelCPUSeconds, err = meter.Float64ObservableCounter( - "process_cpu_seconds", - otelmetric.WithDescription("Total CPU user and system time in seconds"), - otelmetric.WithUnit("s"), - otelmetric.WithFloat64Callback(func(_ context.Context, o otelmetric.Float64Observer) error { - o.Observe(pm.updateCPUSeconds()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelRSSMemory, err = meter.Int64ObservableGauge( - "process_memory_rss", - otelmetric.WithDescription("Total physical memory (resident set size)"), - otelmetric.WithUnit("By"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(pm.updateRSSMemory()) - return nil - })) - errs = multierr.Append(errs, err) - - return errs + _, err = metadata.NewTelemetryBuilder(cfg.ToComponentTelemetrySettings(&component.InstanceID{}), + metadata.WithProcessUptimeCallback(pm.updateProcessUptime), + metadata.WithProcessRuntimeHeapAllocBytesCallback(pm.updateAllocMem), + metadata.WithProcessRuntimeTotalAllocBytesCallback(pm.updateTotalAllocMem), + metadata.WithProcessRuntimeTotalSysMemoryBytesCallback(pm.updateSysMem), + metadata.WithProcessCPUSecondsCallback(pm.updateCPUSeconds), + metadata.WithProcessMemoryRssCallback(pm.updateRSSMemory), + ) + return err } func (pm *processMetrics) updateProcessUptime() float64 { diff --git a/service/internal/proctelemetry/process_telemetry_linux_test.go b/service/internal/proctelemetry/process_telemetry_linux_test.go index 1a15f28fc7e..73605c0ae8e 100644 --- a/service/internal/proctelemetry/process_telemetry_linux_test.go +++ b/service/internal/proctelemetry/process_telemetry_linux_test.go @@ -21,7 +21,7 @@ func TestProcessTelemetryWithHostProc(t *testing.T) { // Make the sure the environment variable value is not used. t.Setenv("HOST_PROC", "foo/bar") - require.NoError(t, RegisterProcessMetrics(tel.MeterProvider, 0, WithHostProc("/proc"))) + require.NoError(t, RegisterProcessMetrics(tel.TelemetrySettings, 0, WithHostProc("/proc"))) // Check that the metrics are actually filled. time.Sleep(200 * time.Millisecond) diff --git a/service/internal/proctelemetry/process_telemetry_test.go b/service/internal/proctelemetry/process_telemetry_test.go index 40d0f54ef27..f1da8d6a34c 100644 --- a/service/internal/proctelemetry/process_telemetry_test.go +++ b/service/internal/proctelemetry/process_telemetry_test.go @@ -20,13 +20,12 @@ import ( sdkmetric "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/resource" - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtelemetry" + "go.opentelemetry.io/collector/service/internal/servicetelemetry" ) type testTelemetry struct { - component.TelemetrySettings + servicetelemetry.TelemetrySettings promHandler http.Handler meterProvider *sdkmetric.MeterProvider } @@ -42,7 +41,7 @@ var expectedMetrics = []string{ func setupTelemetry(t *testing.T) testTelemetry { settings := testTelemetry{ - TelemetrySettings: componenttest.NewNopTelemetrySettings(), + TelemetrySettings: servicetelemetry.NewNopTelemetrySettings(), } settings.TelemetrySettings.MetricsLevel = configtelemetry.LevelNormal @@ -79,7 +78,7 @@ func fetchPrometheusMetrics(handler http.Handler) (map[string]*io_prometheus_cli func TestProcessTelemetry(t *testing.T) { tel := setupTelemetry(t) - require.NoError(t, RegisterProcessMetrics(tel.MeterProvider, 0)) + require.NoError(t, RegisterProcessMetrics(tel.TelemetrySettings, 0)) mp, err := fetchPrometheusMetrics(tel.promHandler) require.NoError(t, err) diff --git a/service/metadata.yaml b/service/metadata.yaml new file mode 100644 index 00000000000..d5417740d57 --- /dev/null +++ b/service/metadata.yaml @@ -0,0 +1,68 @@ +type: service + +status: + class: pkg + stability: + development: [traces, metrics, logs] + distributions: [core, contrib] + +tests: + goleak: + ignore: + top: + # See https://github.com/census-instrumentation/opencensus-go/issues/1191 for more information. + - "go.opencensus.io/stats/view.(*worker).start" + - "go.opentelemetry.io/collector/service/internal/proctelemetry.InitPrometheusServer.func1" + +telemetry: + metrics: + process_uptime: + enabled: true + description: Uptime of the process + unit: s + sum: + async: true + value_type: double + monotonic: true + + process_runtime_heap_alloc_bytes: + enabled: true + description: Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') + unit: By + gauge: + async: true + value_type: int + + process_runtime_total_alloc_bytes: + enabled: true + description: Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') + unit: By + sum: + async: true + value_type: int + monotonic: true + + process_runtime_total_sys_memory_bytes: + enabled: true + description: Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') + unit: By + gauge: + async: true + value_type: int + + process_cpu_seconds: + enabled: true + description: Total CPU user and system time in seconds + unit: s + sum: + async: true + value_type: double + monotonic: true + + process_memory_rss: + enabled: true + description: Total physical memory (resident set size) + unit: By + gauge: + async: true + value_type: int diff --git a/service/service.go b/service/service.go index 53ea3eebe65..eb320cfec2c 100644 --- a/service/service.go +++ b/service/service.go @@ -1,6 +1,8 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 +//go:generate mdatagen metadata.yaml + package service // import "go.opentelemetry.io/collector/service" import ( @@ -289,7 +291,7 @@ func (srv *Service) initExtensionsAndPipeline(ctx context.Context, set Settings, if cfg.Telemetry.Metrics.Level != configtelemetry.LevelNone && cfg.Telemetry.Metrics.Address != "" { // The process telemetry initialization requires the ballast size, which is available after the extensions are initialized. - if err = proctelemetry.RegisterProcessMetrics(srv.telemetrySettings.MeterProvider, getBallastSize(srv.host)); err != nil { + if err = proctelemetry.RegisterProcessMetrics(srv.telemetrySettings, getBallastSize(srv.host)); err != nil { return fmt.Errorf("failed to register process metrics: %w", err) } } From ff6f029f99b30667823ea43547c099078c8f0211 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Thu, 30 May 2024 09:41:41 -0700 Subject: [PATCH 004/168] [exporterhelper] Fix potential deadlocks in BatcherSender shutdown (#10258) Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/10255 --- .../fix-batcher-sender-shutdown-deadlock.yaml | 20 +++++++ exporter/exporterhelper/batch_sender.go | 50 +++++++++------- exporter/exporterhelper/batch_sender_test.go | 57 +++++++++++++++++++ 3 files changed, 107 insertions(+), 20 deletions(-) create mode 100644 .chloggen/fix-batcher-sender-shutdown-deadlock.yaml diff --git a/.chloggen/fix-batcher-sender-shutdown-deadlock.yaml b/.chloggen/fix-batcher-sender-shutdown-deadlock.yaml new file mode 100644 index 00000000000..76baecac6b5 --- /dev/null +++ b/.chloggen/fix-batcher-sender-shutdown-deadlock.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix potential deadlocks in BatcherSender shutdown + +# One or more tracking issues or pull requests related to the change +issues: [10255] + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/exporter/exporterhelper/batch_sender.go b/exporter/exporterhelper/batch_sender.go index 29065bfe980..086c9724aa3 100644 --- a/exporter/exporterhelper/batch_sender.go +++ b/exporter/exporterhelper/batch_sender.go @@ -40,22 +40,24 @@ type batchSender struct { logger *zap.Logger - shutdownCh chan struct{} - stopped *atomic.Bool + shutdownCh chan struct{} + shutdownCompleteCh chan struct{} + stopped *atomic.Bool } // newBatchSender returns a new batch consumer component. func newBatchSender(cfg exporterbatcher.Config, set exporter.CreateSettings, mf exporterbatcher.BatchMergeFunc[Request], msf exporterbatcher.BatchMergeSplitFunc[Request]) *batchSender { bs := &batchSender{ - activeBatch: newEmptyBatch(), - cfg: cfg, - logger: set.Logger, - mergeFunc: mf, - mergeSplitFunc: msf, - shutdownCh: make(chan struct{}), - stopped: &atomic.Bool{}, - resetTimerCh: make(chan struct{}), + activeBatch: newEmptyBatch(), + cfg: cfg, + logger: set.Logger, + mergeFunc: mf, + mergeSplitFunc: msf, + shutdownCh: make(chan struct{}), + shutdownCompleteCh: make(chan struct{}), + stopped: &atomic.Bool{}, + resetTimerCh: make(chan struct{}), } return bs } @@ -66,14 +68,19 @@ func (bs *batchSender) Start(_ context.Context, _ component.Host) error { for { select { case <-bs.shutdownCh: - bs.mu.Lock() - if bs.activeBatch.request != nil { - bs.exportActiveBatch() + // There is a minimal chance that another request is added after the shutdown signal. + // This loop will handle that case. + for bs.activeRequests.Load() > 0 { + bs.mu.Lock() + if bs.activeBatch.request != nil { + bs.exportActiveBatch() + } + bs.mu.Unlock() } - bs.mu.Unlock() if !timer.Stop() { <-timer.C } + close(bs.shutdownCompleteCh) return case <-timer.C: bs.mu.Lock() @@ -118,6 +125,12 @@ func (bs *batchSender) exportActiveBatch() { bs.activeBatch = newEmptyBatch() } +func (bs *batchSender) resetTimer() { + if !bs.stopped.Load() { + bs.resetTimerCh <- struct{}{} + } +} + // isActiveBatchReady returns true if the active batch is ready to be exported. // The batch is ready if it has reached the minimum size or the concurrency limit is reached. // Caller must hold the lock. @@ -154,7 +167,7 @@ func (bs *batchSender) sendMergeSplitBatch(ctx context.Context, req Request) err batch := bs.activeBatch if bs.isActiveBatchReady() || len(reqs) > 1 { bs.exportActiveBatch() - bs.resetTimerCh <- struct{}{} + bs.resetTimer() } bs.mu.Unlock() <-batch.done @@ -194,7 +207,7 @@ func (bs *batchSender) sendMergeBatch(ctx context.Context, req Request) error { batch := bs.activeBatch if bs.isActiveBatchReady() { bs.exportActiveBatch() - bs.resetTimerCh <- struct{}{} + bs.resetTimer() } bs.mu.Unlock() <-batch.done @@ -215,9 +228,6 @@ func (bs *batchSender) updateActiveBatch(ctx context.Context, req Request) { func (bs *batchSender) Shutdown(context.Context) error { bs.stopped.Store(true) close(bs.shutdownCh) - // Wait for the active requests to finish. - for bs.activeRequests.Load() > 0 { - time.Sleep(10 * time.Millisecond) - } + <-bs.shutdownCompleteCh return nil } diff --git a/exporter/exporterhelper/batch_sender_test.go b/exporter/exporterhelper/batch_sender_test.go index 68396ed7c58..08ab42f89b5 100644 --- a/exporter/exporterhelper/batch_sender_test.go +++ b/exporter/exporterhelper/batch_sender_test.go @@ -436,6 +436,63 @@ func TestBatchSender_WithBatcherOption(t *testing.T) { } } +// TestBatchSender_ShutdownDeadlock tests that the exporter does not deadlock when shutting down while a batch is being +// merged. +func TestBatchSender_ShutdownDeadlock(t *testing.T) { + blockMerge := make(chan struct{}) + waitMerge := make(chan struct{}, 10) + + // blockedBatchMergeFunc blocks until the blockMerge channel is closed + blockedBatchMergeFunc := func(_ context.Context, r1 Request, _ Request) (Request, error) { + waitMerge <- struct{}{} + <-blockMerge + return r1, nil + } + + bCfg := exporterbatcher.NewDefaultConfig() + bCfg.FlushTimeout = 10 * time.Minute // high timeout to avoid the timeout to trigger + be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, + WithBatcher(bCfg, WithRequestBatchFuncs(blockedBatchMergeFunc, fakeBatchMergeSplitFunc))) + require.NoError(t, err) + require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost())) + + sink := newFakeRequestSink() + + // Send 10 concurrent requests and wait for them to start + startWG := sync.WaitGroup{} + for i := 0; i < 10; i++ { + startWG.Add(1) + go func() { + startWG.Done() + require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) + }() + } + startWG.Wait() + + // Wait for at least one batch to enter the merge function + <-waitMerge + + // Initiate the exporter shutdown, unblock the batch merge function to catch possible deadlocks, + // then wait for the exporter to finish. + startShutdown := make(chan struct{}) + doneShutdown := make(chan struct{}) + go func() { + close(startShutdown) + require.Nil(t, be.Shutdown(context.Background())) + close(doneShutdown) + }() + <-startShutdown + close(blockMerge) + <-doneShutdown + + // The exporter should have sent only one "merged" batch, in some cases it might send two if the shutdown + // happens before the batch is fully merged. + assert.LessOrEqual(t, uint64(1), sink.requestsCount.Load()) + + // blockedBatchMergeFunc just returns the first request, so the items count should be 4 times the requests count. + assert.Equal(t, sink.requestsCount.Load()*4, sink.itemsCount.Load()) +} + func queueBatchExporter(t *testing.T, batchOption Option) *baseExporter { be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, batchOption, WithRequestQueue(exporterqueue.NewDefaultConfig(), exporterqueue.NewMemoryQueueFactory[Request]())) From 1749a8f19d3d9a3c31ab4d55a468822ff61e540d Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 30 May 2024 11:45:17 -0700 Subject: [PATCH 005/168] Revert "[chore] use mdatagen to generate service metrics (#10160)" (#10271) This reverts commit 10bcef33e6d26104036ed2874cb179c4437abc98. --- service/documentation.md | 55 ------- service/generated_package_test.go | 13 -- .../internal/metadata/generated_telemetry.go | 155 ------------------ .../metadata/generated_telemetry_test.go | 76 --------- .../proctelemetry/process_telemetry.go | 94 +++++++++-- .../process_telemetry_linux_test.go | 2 +- .../proctelemetry/process_telemetry_test.go | 9 +- service/metadata.yaml | 68 -------- service/service.go | 4 +- 9 files changed, 88 insertions(+), 388 deletions(-) delete mode 100644 service/documentation.md delete mode 100644 service/generated_package_test.go delete mode 100644 service/internal/metadata/generated_telemetry.go delete mode 100644 service/internal/metadata/generated_telemetry_test.go delete mode 100644 service/metadata.yaml diff --git a/service/documentation.md b/service/documentation.md deleted file mode 100644 index 2cbd48a0708..00000000000 --- a/service/documentation.md +++ /dev/null @@ -1,55 +0,0 @@ -[comment]: <> (Code generated by mdatagen. DO NOT EDIT.) - -# service - -## Internal Telemetry - -The following telemetry is emitted by this component. - -### process_cpu_seconds - -Total CPU user and system time in seconds - -| Unit | Metric Type | Value Type | Monotonic | -| ---- | ----------- | ---------- | --------- | -| s | Sum | Double | true | - -### process_memory_rss - -Total physical memory (resident set size) - -| Unit | Metric Type | Value Type | -| ---- | ----------- | ---------- | -| By | Gauge | Int | - -### process_runtime_heap_alloc_bytes - -Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') - -| Unit | Metric Type | Value Type | -| ---- | ----------- | ---------- | -| By | Gauge | Int | - -### process_runtime_total_alloc_bytes - -Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') - -| Unit | Metric Type | Value Type | Monotonic | -| ---- | ----------- | ---------- | --------- | -| By | Sum | Int | true | - -### process_runtime_total_sys_memory_bytes - -Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') - -| Unit | Metric Type | Value Type | -| ---- | ----------- | ---------- | -| By | Gauge | Int | - -### process_uptime - -Uptime of the process - -| Unit | Metric Type | Value Type | Monotonic | -| ---- | ----------- | ---------- | --------- | -| s | Sum | Double | true | diff --git a/service/generated_package_test.go b/service/generated_package_test.go deleted file mode 100644 index 545b6bb0c5e..00000000000 --- a/service/generated_package_test.go +++ /dev/null @@ -1,13 +0,0 @@ -// Code generated by mdatagen. DO NOT EDIT. - -package service - -import ( - "testing" - - "go.uber.org/goleak" -) - -func TestMain(m *testing.M) { - goleak.VerifyTestMain(m, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), goleak.IgnoreTopFunction("go.opentelemetry.io/collector/service/internal/proctelemetry.InitPrometheusServer.func1")) -} diff --git a/service/internal/metadata/generated_telemetry.go b/service/internal/metadata/generated_telemetry.go deleted file mode 100644 index 3d1c7b37a04..00000000000 --- a/service/internal/metadata/generated_telemetry.go +++ /dev/null @@ -1,155 +0,0 @@ -// Code generated by mdatagen. DO NOT EDIT. - -package metadata - -import ( - "context" - "errors" - - "go.opentelemetry.io/otel/metric" - "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" -) - -func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("go.opentelemetry.io/collector/service") -} - -func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("go.opentelemetry.io/collector/service") -} - -// TelemetryBuilder provides an interface for components to report telemetry -// as defined in metadata and user config. -type TelemetryBuilder struct { - ProcessCPUSeconds metric.Float64ObservableCounter - observeProcessCPUSeconds func() float64 - ProcessMemoryRss metric.Int64ObservableGauge - observeProcessMemoryRss func() int64 - ProcessRuntimeHeapAllocBytes metric.Int64ObservableGauge - observeProcessRuntimeHeapAllocBytes func() int64 - ProcessRuntimeTotalAllocBytes metric.Int64ObservableCounter - observeProcessRuntimeTotalAllocBytes func() int64 - ProcessRuntimeTotalSysMemoryBytes metric.Int64ObservableGauge - observeProcessRuntimeTotalSysMemoryBytes func() int64 - ProcessUptime metric.Float64ObservableCounter - observeProcessUptime func() float64 -} - -// telemetryBuilderOption applies changes to default builder. -type telemetryBuilderOption func(*TelemetryBuilder) - -// WithProcessCPUSecondsCallback sets callback for observable ProcessCPUSeconds metric. -func WithProcessCPUSecondsCallback(cb func() float64) telemetryBuilderOption { - return func(builder *TelemetryBuilder) { - builder.observeProcessCPUSeconds = cb - } -} - -// WithProcessMemoryRssCallback sets callback for observable ProcessMemoryRss metric. -func WithProcessMemoryRssCallback(cb func() int64) telemetryBuilderOption { - return func(builder *TelemetryBuilder) { - builder.observeProcessMemoryRss = cb - } -} - -// WithProcessRuntimeHeapAllocBytesCallback sets callback for observable ProcessRuntimeHeapAllocBytes metric. -func WithProcessRuntimeHeapAllocBytesCallback(cb func() int64) telemetryBuilderOption { - return func(builder *TelemetryBuilder) { - builder.observeProcessRuntimeHeapAllocBytes = cb - } -} - -// WithProcessRuntimeTotalAllocBytesCallback sets callback for observable ProcessRuntimeTotalAllocBytes metric. -func WithProcessRuntimeTotalAllocBytesCallback(cb func() int64) telemetryBuilderOption { - return func(builder *TelemetryBuilder) { - builder.observeProcessRuntimeTotalAllocBytes = cb - } -} - -// WithProcessRuntimeTotalSysMemoryBytesCallback sets callback for observable ProcessRuntimeTotalSysMemoryBytes metric. -func WithProcessRuntimeTotalSysMemoryBytesCallback(cb func() int64) telemetryBuilderOption { - return func(builder *TelemetryBuilder) { - builder.observeProcessRuntimeTotalSysMemoryBytes = cb - } -} - -// WithProcessUptimeCallback sets callback for observable ProcessUptime metric. -func WithProcessUptimeCallback(cb func() float64) telemetryBuilderOption { - return func(builder *TelemetryBuilder) { - builder.observeProcessUptime = cb - } -} - -// NewTelemetryBuilder provides a struct with methods to update all internal telemetry -// for a component -func NewTelemetryBuilder(settings component.TelemetrySettings, options ...telemetryBuilderOption) (*TelemetryBuilder, error) { - builder := TelemetryBuilder{} - for _, op := range options { - op(&builder) - } - var err, errs error - meter := Meter(settings) - builder.ProcessCPUSeconds, err = meter.Float64ObservableCounter( - "process_cpu_seconds", - metric.WithDescription("Total CPU user and system time in seconds"), - metric.WithUnit("s"), - metric.WithFloat64Callback(func(_ context.Context, o metric.Float64Observer) error { - o.Observe(builder.observeProcessCPUSeconds()) - return nil - }), - ) - errs = errors.Join(errs, err) - builder.ProcessMemoryRss, err = meter.Int64ObservableGauge( - "process_memory_rss", - metric.WithDescription("Total physical memory (resident set size)"), - metric.WithUnit("By"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessMemoryRss()) - return nil - }), - ) - errs = errors.Join(errs, err) - builder.ProcessRuntimeHeapAllocBytes, err = meter.Int64ObservableGauge( - "process_runtime_heap_alloc_bytes", - metric.WithDescription("Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc')"), - metric.WithUnit("By"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessRuntimeHeapAllocBytes()) - return nil - }), - ) - errs = errors.Join(errs, err) - builder.ProcessRuntimeTotalAllocBytes, err = meter.Int64ObservableCounter( - "process_runtime_total_alloc_bytes", - metric.WithDescription("Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')"), - metric.WithUnit("By"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessRuntimeTotalAllocBytes()) - return nil - }), - ) - errs = errors.Join(errs, err) - builder.ProcessRuntimeTotalSysMemoryBytes, err = meter.Int64ObservableGauge( - "process_runtime_total_sys_memory_bytes", - metric.WithDescription("Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys')"), - metric.WithUnit("By"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessRuntimeTotalSysMemoryBytes()) - return nil - }), - ) - errs = errors.Join(errs, err) - builder.ProcessUptime, err = meter.Float64ObservableCounter( - "process_uptime", - metric.WithDescription("Uptime of the process"), - metric.WithUnit("s"), - metric.WithFloat64Callback(func(_ context.Context, o metric.Float64Observer) error { - o.Observe(builder.observeProcessUptime()) - return nil - }), - ) - errs = errors.Join(errs, err) - return &builder, errs -} diff --git a/service/internal/metadata/generated_telemetry_test.go b/service/internal/metadata/generated_telemetry_test.go deleted file mode 100644 index 5e225295ba3..00000000000 --- a/service/internal/metadata/generated_telemetry_test.go +++ /dev/null @@ -1,76 +0,0 @@ -// Code generated by mdatagen. DO NOT EDIT. - -package metadata - -import ( - "testing" - - "github.com/stretchr/testify/require" - "go.opentelemetry.io/otel/metric" - embeddedmetric "go.opentelemetry.io/otel/metric/embedded" - noopmetric "go.opentelemetry.io/otel/metric/noop" - "go.opentelemetry.io/otel/trace" - embeddedtrace "go.opentelemetry.io/otel/trace/embedded" - nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" -) - -type mockMeter struct { - noopmetric.Meter - name string -} -type mockMeterProvider struct { - embeddedmetric.MeterProvider -} - -func (m mockMeterProvider) Meter(name string, opts ...metric.MeterOption) metric.Meter { - return mockMeter{name: name} -} - -type mockTracer struct { - nooptrace.Tracer - name string -} - -type mockTracerProvider struct { - embeddedtrace.TracerProvider -} - -func (m mockTracerProvider) Tracer(name string, opts ...trace.TracerOption) trace.Tracer { - return mockTracer{name: name} -} - -func TestProviders(t *testing.T) { - set := component.TelemetrySettings{ - MeterProvider: mockMeterProvider{}, - TracerProvider: mockTracerProvider{}, - } - - meter := Meter(set) - if m, ok := meter.(mockMeter); ok { - require.Equal(t, "go.opentelemetry.io/collector/service", m.name) - } else { - require.Fail(t, "returned Meter not mockMeter") - } - - tracer := Tracer(set) - if m, ok := tracer.(mockTracer); ok { - require.Equal(t, "go.opentelemetry.io/collector/service", m.name) - } else { - require.Fail(t, "returned Meter not mockTracer") - } -} - -func TestNewTelemetryBuilder(t *testing.T) { - set := component.TelemetrySettings{ - MeterProvider: mockMeterProvider{}, - TracerProvider: mockTracerProvider{}, - } - applied := false - _, err := NewTelemetryBuilder(set, func(b *TelemetryBuilder) { - applied = true - }) - require.NoError(t, err) - require.True(t, applied) -} diff --git a/service/internal/proctelemetry/process_telemetry.go b/service/internal/proctelemetry/process_telemetry.go index 9f8f0874e97..991897f8b1b 100644 --- a/service/internal/proctelemetry/process_telemetry.go +++ b/service/internal/proctelemetry/process_telemetry.go @@ -12,10 +12,13 @@ import ( "github.com/shirou/gopsutil/v3/common" "github.com/shirou/gopsutil/v3/process" + otelmetric "go.opentelemetry.io/otel/metric" + "go.uber.org/multierr" +) - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/service/internal/metadata" - "go.opentelemetry.io/collector/service/internal/servicetelemetry" +const ( + scopeName = "go.opentelemetry.io/collector/service/process_telemetry" + processNameKey = "process_name" ) // processMetrics is a struct that contains views related to process metrics (cpu, mem, etc) @@ -25,6 +28,13 @@ type processMetrics struct { proc *process.Process context context.Context + otelProcessUptime otelmetric.Float64ObservableCounter + otelAllocMem otelmetric.Int64ObservableGauge + otelTotalAllocMem otelmetric.Int64ObservableCounter + otelSysMem otelmetric.Int64ObservableGauge + otelCPUSeconds otelmetric.Float64ObservableCounter + otelRSSMemory otelmetric.Int64ObservableGauge + // mu protects everything bellow. mu sync.Mutex lastMsRead time.Time @@ -54,7 +64,7 @@ func WithHostProc(hostProc string) RegisterOption { // RegisterProcessMetrics creates a new set of processMetrics (mem, cpu) that can be used to measure // basic information about this process. -func RegisterProcessMetrics(cfg servicetelemetry.TelemetrySettings, ballastSizeBytes uint64, opts ...RegisterOption) error { +func RegisterProcessMetrics(mp otelmetric.MeterProvider, ballastSizeBytes uint64, opts ...RegisterOption) error { set := registerOption{} for _, opt := range opts { opt.apply(&set) @@ -76,15 +86,73 @@ func RegisterProcessMetrics(cfg servicetelemetry.TelemetrySettings, ballastSizeB return err } - _, err = metadata.NewTelemetryBuilder(cfg.ToComponentTelemetrySettings(&component.InstanceID{}), - metadata.WithProcessUptimeCallback(pm.updateProcessUptime), - metadata.WithProcessRuntimeHeapAllocBytesCallback(pm.updateAllocMem), - metadata.WithProcessRuntimeTotalAllocBytesCallback(pm.updateTotalAllocMem), - metadata.WithProcessRuntimeTotalSysMemoryBytesCallback(pm.updateSysMem), - metadata.WithProcessCPUSecondsCallback(pm.updateCPUSeconds), - metadata.WithProcessMemoryRssCallback(pm.updateRSSMemory), - ) - return err + return pm.record(mp.Meter(scopeName)) +} + +func (pm *processMetrics) record(meter otelmetric.Meter) error { + var errs, err error + + pm.otelProcessUptime, err = meter.Float64ObservableCounter( + "process_uptime", + otelmetric.WithDescription("Uptime of the process"), + otelmetric.WithUnit("s"), + otelmetric.WithFloat64Callback(func(_ context.Context, o otelmetric.Float64Observer) error { + o.Observe(pm.updateProcessUptime()) + return nil + })) + errs = multierr.Append(errs, err) + + pm.otelAllocMem, err = meter.Int64ObservableGauge( + "process_runtime_heap_alloc_bytes", + otelmetric.WithDescription("Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc')"), + otelmetric.WithUnit("By"), + otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { + o.Observe(pm.updateAllocMem()) + return nil + })) + errs = multierr.Append(errs, err) + + pm.otelTotalAllocMem, err = meter.Int64ObservableCounter( + "process_runtime_total_alloc_bytes", + otelmetric.WithDescription("Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')"), + otelmetric.WithUnit("By"), + otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { + o.Observe(pm.updateTotalAllocMem()) + return nil + })) + errs = multierr.Append(errs, err) + + pm.otelSysMem, err = meter.Int64ObservableGauge( + "process_runtime_total_sys_memory_bytes", + otelmetric.WithDescription("Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys')"), + otelmetric.WithUnit("By"), + otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { + o.Observe(pm.updateSysMem()) + return nil + })) + errs = multierr.Append(errs, err) + + pm.otelCPUSeconds, err = meter.Float64ObservableCounter( + "process_cpu_seconds", + otelmetric.WithDescription("Total CPU user and system time in seconds"), + otelmetric.WithUnit("s"), + otelmetric.WithFloat64Callback(func(_ context.Context, o otelmetric.Float64Observer) error { + o.Observe(pm.updateCPUSeconds()) + return nil + })) + errs = multierr.Append(errs, err) + + pm.otelRSSMemory, err = meter.Int64ObservableGauge( + "process_memory_rss", + otelmetric.WithDescription("Total physical memory (resident set size)"), + otelmetric.WithUnit("By"), + otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { + o.Observe(pm.updateRSSMemory()) + return nil + })) + errs = multierr.Append(errs, err) + + return errs } func (pm *processMetrics) updateProcessUptime() float64 { diff --git a/service/internal/proctelemetry/process_telemetry_linux_test.go b/service/internal/proctelemetry/process_telemetry_linux_test.go index 73605c0ae8e..1a15f28fc7e 100644 --- a/service/internal/proctelemetry/process_telemetry_linux_test.go +++ b/service/internal/proctelemetry/process_telemetry_linux_test.go @@ -21,7 +21,7 @@ func TestProcessTelemetryWithHostProc(t *testing.T) { // Make the sure the environment variable value is not used. t.Setenv("HOST_PROC", "foo/bar") - require.NoError(t, RegisterProcessMetrics(tel.TelemetrySettings, 0, WithHostProc("/proc"))) + require.NoError(t, RegisterProcessMetrics(tel.MeterProvider, 0, WithHostProc("/proc"))) // Check that the metrics are actually filled. time.Sleep(200 * time.Millisecond) diff --git a/service/internal/proctelemetry/process_telemetry_test.go b/service/internal/proctelemetry/process_telemetry_test.go index f1da8d6a34c..40d0f54ef27 100644 --- a/service/internal/proctelemetry/process_telemetry_test.go +++ b/service/internal/proctelemetry/process_telemetry_test.go @@ -20,12 +20,13 @@ import ( sdkmetric "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/resource" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtelemetry" - "go.opentelemetry.io/collector/service/internal/servicetelemetry" ) type testTelemetry struct { - servicetelemetry.TelemetrySettings + component.TelemetrySettings promHandler http.Handler meterProvider *sdkmetric.MeterProvider } @@ -41,7 +42,7 @@ var expectedMetrics = []string{ func setupTelemetry(t *testing.T) testTelemetry { settings := testTelemetry{ - TelemetrySettings: servicetelemetry.NewNopTelemetrySettings(), + TelemetrySettings: componenttest.NewNopTelemetrySettings(), } settings.TelemetrySettings.MetricsLevel = configtelemetry.LevelNormal @@ -78,7 +79,7 @@ func fetchPrometheusMetrics(handler http.Handler) (map[string]*io_prometheus_cli func TestProcessTelemetry(t *testing.T) { tel := setupTelemetry(t) - require.NoError(t, RegisterProcessMetrics(tel.TelemetrySettings, 0)) + require.NoError(t, RegisterProcessMetrics(tel.MeterProvider, 0)) mp, err := fetchPrometheusMetrics(tel.promHandler) require.NoError(t, err) diff --git a/service/metadata.yaml b/service/metadata.yaml deleted file mode 100644 index d5417740d57..00000000000 --- a/service/metadata.yaml +++ /dev/null @@ -1,68 +0,0 @@ -type: service - -status: - class: pkg - stability: - development: [traces, metrics, logs] - distributions: [core, contrib] - -tests: - goleak: - ignore: - top: - # See https://github.com/census-instrumentation/opencensus-go/issues/1191 for more information. - - "go.opencensus.io/stats/view.(*worker).start" - - "go.opentelemetry.io/collector/service/internal/proctelemetry.InitPrometheusServer.func1" - -telemetry: - metrics: - process_uptime: - enabled: true - description: Uptime of the process - unit: s - sum: - async: true - value_type: double - monotonic: true - - process_runtime_heap_alloc_bytes: - enabled: true - description: Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') - unit: By - gauge: - async: true - value_type: int - - process_runtime_total_alloc_bytes: - enabled: true - description: Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') - unit: By - sum: - async: true - value_type: int - monotonic: true - - process_runtime_total_sys_memory_bytes: - enabled: true - description: Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') - unit: By - gauge: - async: true - value_type: int - - process_cpu_seconds: - enabled: true - description: Total CPU user and system time in seconds - unit: s - sum: - async: true - value_type: double - monotonic: true - - process_memory_rss: - enabled: true - description: Total physical memory (resident set size) - unit: By - gauge: - async: true - value_type: int diff --git a/service/service.go b/service/service.go index eb320cfec2c..53ea3eebe65 100644 --- a/service/service.go +++ b/service/service.go @@ -1,8 +1,6 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -//go:generate mdatagen metadata.yaml - package service // import "go.opentelemetry.io/collector/service" import ( @@ -291,7 +289,7 @@ func (srv *Service) initExtensionsAndPipeline(ctx context.Context, set Settings, if cfg.Telemetry.Metrics.Level != configtelemetry.LevelNone && cfg.Telemetry.Metrics.Address != "" { // The process telemetry initialization requires the ballast size, which is available after the extensions are initialized. - if err = proctelemetry.RegisterProcessMetrics(srv.telemetrySettings, getBallastSize(srv.host)); err != nil { + if err = proctelemetry.RegisterProcessMetrics(srv.telemetrySettings.MeterProvider, getBallastSize(srv.host)); err != nil { return fmt.Errorf("failed to register process metrics: %w", err) } } From 4bbb60402f262214aecacb24839e75159143a43f Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Thu, 30 May 2024 12:18:33 -0700 Subject: [PATCH 006/168] [chore] Remove redundant wait group from a test (#10269) https://github.com/open-telemetry/opentelemetry-collector/pull/10258/files#r1621017272 made me wonder if the wait group is really necessary. We have another synchronization that waits for at least two requests to enter the merge function, which should be enough. So, we don't necessarily need this wait group. Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- exporter/exporterhelper/batch_sender_test.go | 26 ++++++-------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/exporter/exporterhelper/batch_sender_test.go b/exporter/exporterhelper/batch_sender_test.go index 08ab42f89b5..bc59c0d63c5 100644 --- a/exporter/exporterhelper/batch_sender_test.go +++ b/exporter/exporterhelper/batch_sender_test.go @@ -443,9 +443,10 @@ func TestBatchSender_ShutdownDeadlock(t *testing.T) { waitMerge := make(chan struct{}, 10) // blockedBatchMergeFunc blocks until the blockMerge channel is closed - blockedBatchMergeFunc := func(_ context.Context, r1 Request, _ Request) (Request, error) { + blockedBatchMergeFunc := func(_ context.Context, r1 Request, r2 Request) (Request, error) { waitMerge <- struct{}{} <-blockMerge + r1.(*fakeRequest).items += r2.(*fakeRequest).items return r1, nil } @@ -458,18 +459,11 @@ func TestBatchSender_ShutdownDeadlock(t *testing.T) { sink := newFakeRequestSink() - // Send 10 concurrent requests and wait for them to start - startWG := sync.WaitGroup{} - for i := 0; i < 10; i++ { - startWG.Add(1) - go func() { - startWG.Done() - require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) - }() - } - startWG.Wait() + // Send 2 concurrent requests + go func() { require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) }() + go func() { require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) }() - // Wait for at least one batch to enter the merge function + // Wait for the requests to enter the merge function <-waitMerge // Initiate the exporter shutdown, unblock the batch merge function to catch possible deadlocks, @@ -485,12 +479,8 @@ func TestBatchSender_ShutdownDeadlock(t *testing.T) { close(blockMerge) <-doneShutdown - // The exporter should have sent only one "merged" batch, in some cases it might send two if the shutdown - // happens before the batch is fully merged. - assert.LessOrEqual(t, uint64(1), sink.requestsCount.Load()) - - // blockedBatchMergeFunc just returns the first request, so the items count should be 4 times the requests count. - assert.Equal(t, sink.requestsCount.Load()*4, sink.itemsCount.Load()) + assert.EqualValues(t, 1, sink.requestsCount.Load()) + assert.EqualValues(t, 8, sink.itemsCount.Load()) } func queueBatchExporter(t *testing.T, batchOption Option) *baseExporter { From d55d04226e578a2ae1fb2fae6a44fb9f214bcc07 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 31 May 2024 10:28:50 -0700 Subject: [PATCH 007/168] [chore] remove TODO from confmap code (#10278) Remove a TODO comment on confmap/provider.go related to ChangeEvent. This struct is used extensively in providers that rely on changes such as: https://github.com/signalfx/splunk-otel-collector/blob/main/internal/configsource/etcd2configsource/source.go#L84 --- confmap/provider.go | 1 - 1 file changed, 1 deletion(-) diff --git a/confmap/provider.go b/confmap/provider.go index 95c0581327e..192577ed4d8 100644 --- a/confmap/provider.go +++ b/confmap/provider.go @@ -89,7 +89,6 @@ type Provider interface { type WatcherFunc func(*ChangeEvent) // ChangeEvent describes the particular change event that happened with the config. -// TODO: see if this can be eliminated. type ChangeEvent struct { // Error is nil if the config is changed and needs to be re-fetched. // Any non-nil error indicates that there was a problem with watching the config changes. From b6510d086dac849920eaccd43db5573883712bca Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 31 May 2024 14:32:22 -0600 Subject: [PATCH 008/168] [otelcol] Removed deprecated `ConfigProvider` field from settings (#10281) --- .chloggen/otelcol-remove-deprecations.yaml | 25 +++++++++++++++++++ otelcol/collector.go | 16 +++---------- otelcol/collector_test.go | 23 ++++++++---------- otelcol/command.go | 28 ++++++++++------------ otelcol/command_components_test.go | 9 +++---- 5 files changed, 54 insertions(+), 47 deletions(-) create mode 100644 .chloggen/otelcol-remove-deprecations.yaml diff --git a/.chloggen/otelcol-remove-deprecations.yaml b/.chloggen/otelcol-remove-deprecations.yaml new file mode 100644 index 00000000000..75dbd5313f9 --- /dev/null +++ b/.chloggen/otelcol-remove-deprecations.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove deprecated `ConfigProvider` field from `CollectorSettings` + +# One or more tracking issues or pull requests related to the change +issues: [10281] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/otelcol/collector.go b/otelcol/collector.go index 64339a4040d..8f9839af6c8 100644 --- a/otelcol/collector.go +++ b/otelcol/collector.go @@ -68,11 +68,6 @@ type CollectorSettings struct { // and manually handle the signals to shutdown the collector. DisableGracefulShutdown bool - // Deprecated: [v0.95.0] Use ConfigProviderSettings instead. - // ConfigProvider provides the service configuration. - // If the provider watches for configuration change, collector may reload the new configuration upon changes. - ConfigProvider ConfigProvider - // ConfigProviderSettings allows configuring the way the Collector retrieves its configuration // The Collector will reload based on configuration changes from the ConfigProvider if any // confmap.Providers watch for configuration changes. @@ -118,9 +113,6 @@ type Collector struct { // NewCollector creates and returns a new instance of Collector. func NewCollector(set CollectorSettings) (*Collector, error) { - var err error - configProvider := set.ConfigProvider - bc := newBufferedCore(zapcore.DebugLevel) cc := &collectorCore{core: bc} options := append([]zap.Option{zap.WithCaller(true)}, set.LoggingOptions...) @@ -128,11 +120,9 @@ func NewCollector(set CollectorSettings) (*Collector, error) { set.ConfigProviderSettings.ResolverSettings.ProviderSettings = confmap.ProviderSettings{Logger: logger} set.ConfigProviderSettings.ResolverSettings.ConverterSettings = confmap.ConverterSettings{Logger: logger} - if configProvider == nil { - configProvider, err = NewConfigProvider(set.ConfigProviderSettings) - if err != nil { - return nil, err - } + configProvider, err := NewConfigProvider(set.ConfigProviderSettings) + if err != nil { + return nil, err } state := &atomic.Int32{} diff --git a/otelcol/collector_test.go b/otelcol/collector_test.go index b96a6fc15db..68eb3b54318 100644 --- a/otelcol/collector_test.go +++ b/otelcol/collector_test.go @@ -82,16 +82,17 @@ func (p mockCfgProvider) Watch() <-chan error { } func TestCollectorStateAfterConfigChange(t *testing.T) { - provider, err := NewConfigProvider(newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")})) - require.NoError(t, err) - watcher := make(chan error, 1) col, err := NewCollector(CollectorSettings{ - BuildInfo: component.NewDefaultBuildInfo(), - Factories: nopFactories, - ConfigProvider: &mockCfgProvider{ConfigProvider: provider, watcher: watcher}, + BuildInfo: component.NewDefaultBuildInfo(), + Factories: nopFactories, + // this will be overwritten, but we need something to get past validation + ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), }) require.NoError(t, err) + provider, err := NewConfigProvider(newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")})) + require.NoError(t, err) + col.configProvider = &mockCfgProvider{ConfigProvider: provider, watcher: watcher} wg := startCollector(context.Background(), t, col) @@ -157,15 +158,11 @@ func TestComponentStatusWatcher(t *testing.T) { factory := extensiontest.NewStatusWatcherExtensionFactory(onStatusChanged) factories.Extensions[factory.Type()] = factory - // Read config from file. This config uses 3 "unhealthy" processors. - validProvider, err := NewConfigProvider(newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-statuswatcher.yaml")})) - require.NoError(t, err) - // Create a collector col, err := NewCollector(CollectorSettings{ - BuildInfo: component.NewDefaultBuildInfo(), - Factories: func() (Factories, error) { return factories, nil }, - ConfigProvider: validProvider, + BuildInfo: component.NewDefaultBuildInfo(), + Factories: func() (Factories, error) { return factories, nil }, + ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-statuswatcher.yaml")}), }) require.NoError(t, err) diff --git a/otelcol/command.go b/otelcol/command.go index 9db850bcc13..648b3a5ffda 100644 --- a/otelcol/command.go +++ b/otelcol/command.go @@ -43,22 +43,20 @@ func NewCommand(set CollectorSettings) *cobra.Command { // Puts command line flags from flags into the CollectorSettings, to be used during config resolution. func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet) error { - if set.ConfigProvider == nil { - resolverSet := &set.ConfigProviderSettings.ResolverSettings - configFlags := getConfigFlag(flags) + resolverSet := &set.ConfigProviderSettings.ResolverSettings + configFlags := getConfigFlag(flags) - if len(configFlags) > 0 { - resolverSet.URIs = configFlags - } - if len(resolverSet.URIs) == 0 { - return errors.New("at least one config flag must be provided") - } - // Provide a default set of providers and converters if none have been specified. - // TODO: Remove this after CollectorSettings.ConfigProvider is removed and instead - // do it in the builder. - if len(resolverSet.ProviderFactories) == 0 && len(resolverSet.ConverterFactories) == 0 { - set.ConfigProviderSettings = newDefaultConfigProviderSettings(resolverSet.URIs) - } + if len(configFlags) > 0 { + resolverSet.URIs = configFlags + } + if len(resolverSet.URIs) == 0 { + return errors.New("at least one config flag must be provided") + } + // Provide a default set of providers and converters if none have been specified. + // TODO: Remove this after CollectorSettings.ConfigProvider is removed and instead + // do it in the builder. + if len(resolverSet.ProviderFactories) == 0 && len(resolverSet.ConverterFactories) == 0 { + set.ConfigProviderSettings = newDefaultConfigProviderSettings(resolverSet.URIs) } return nil } diff --git a/otelcol/command_components_test.go b/otelcol/command_components_test.go index c4e3c7fbf29..d144d1dc32a 100644 --- a/otelcol/command_components_test.go +++ b/otelcol/command_components_test.go @@ -17,13 +17,10 @@ import ( ) func TestNewBuildSubCommand(t *testing.T) { - cfgProvider, err := NewConfigProvider(newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")})) - require.NoError(t, err) - set := CollectorSettings{ - BuildInfo: component.NewDefaultBuildInfo(), - Factories: nopFactories, - ConfigProvider: cfgProvider, + BuildInfo: component.NewDefaultBuildInfo(), + Factories: nopFactories, + ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), } cmd := NewCommand(set) cmd.SetArgs([]string{"components"}) From c30b294718dbc736b5fd9c135a79e08d477ce05b Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Fri, 31 May 2024 13:57:25 -0700 Subject: [PATCH 009/168] [chore] remove deprecated types (#10283) Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_rm-deprecated-request.yaml | 25 +++++++++++++++++++ exporter/exporterhelper/request.go | 10 -------- 2 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 .chloggen/codeboten_rm-deprecated-request.yaml diff --git a/.chloggen/codeboten_rm-deprecated-request.yaml b/.chloggen/codeboten_rm-deprecated-request.yaml new file mode 100644 index 00000000000..57dd648a95d --- /dev/null +++ b/.chloggen/codeboten_rm-deprecated-request.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: remove deprecated RequestMarshaler & RequestUnmarshaler types + +# One or more tracking issues or pull requests related to the change +issues: [10283] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/exporterhelper/request.go b/exporter/exporterhelper/request.go index fa6856d385a..74f0186541f 100644 --- a/exporter/exporterhelper/request.go +++ b/exporter/exporterhelper/request.go @@ -32,16 +32,6 @@ type RequestErrorHandler interface { OnError(error) Request } -// RequestMarshaler is a function that can marshal a Request into bytes. -// -// Deprecated: [v0.94.0] Use exporterqueue.Marshaler[Request] instead. -type RequestMarshaler func(req Request) ([]byte, error) - -// RequestUnmarshaler is a function that can unmarshal bytes into a Request. -// -// Deprecated: [v0.94.0] Use exporterqueue.Unmarshaler[Request] instead. -type RequestUnmarshaler func(data []byte) (Request, error) - // extractPartialRequest returns a new Request that may contain the items left to be sent // if only some items failed to process and can be retried. Otherwise, it returns the original Request. func extractPartialRequest(req Request, err error) Request { From e07b297358e0d659ac94f9ffd188017ada6babc9 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Fri, 31 May 2024 14:00:45 -0700 Subject: [PATCH 010/168] [chore] remove deprecated LoadTLSConfigContext methods (#10284) Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_rm-loadtlsconfigcontext.yaml | 25 +++++++++++++++++++ config/configtls/configtls.go | 14 ----------- 2 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 .chloggen/codeboten_rm-loadtlsconfigcontext.yaml diff --git a/.chloggen/codeboten_rm-loadtlsconfigcontext.yaml b/.chloggen/codeboten_rm-loadtlsconfigcontext.yaml new file mode 100644 index 00000000000..8b8cbea7994 --- /dev/null +++ b/.chloggen/codeboten_rm-loadtlsconfigcontext.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: configtls + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: remove deprecated LoadTLSConfigContext funcs + +# One or more tracking issues or pull requests related to the change +issues: [10283] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/config/configtls/configtls.go b/config/configtls/configtls.go index 2090f775d49..569ae606152 100644 --- a/config/configtls/configtls.go +++ b/config/configtls/configtls.go @@ -376,13 +376,6 @@ func (c Config) loadCert(caPath string) (*x509.CertPool, error) { return certPool, nil } -// LoadTLSConfigContext loads the TLS configuration. -// -// Deprecated: [v0.99.0] Use LoadTLSConfig instead. -func (c ClientConfig) LoadTLSConfigContext(ctx context.Context) (*tls.Config, error) { - return c.LoadTLSConfig(ctx) -} - // LoadTLSConfig loads the TLS configuration. func (c ClientConfig) LoadTLSConfig(_ context.Context) (*tls.Config, error) { if c.Insecure && !c.hasCA() { @@ -398,13 +391,6 @@ func (c ClientConfig) LoadTLSConfig(_ context.Context) (*tls.Config, error) { return tlsCfg, nil } -// LoadTLSConfigContext loads the TLS configuration. -// -// Deprecated: [v0.99.0] Use LoadTLSConfig instead. -func (c ServerConfig) LoadTLSConfigContext(ctx context.Context) (*tls.Config, error) { - return c.LoadTLSConfig(ctx) -} - // LoadTLSConfig loads the TLS configuration. func (c ServerConfig) LoadTLSConfig(_ context.Context) (*tls.Config, error) { tlsCfg, err := c.loadTLSConfig() From ed767dc21968b2b2a2ba2ac95f40fe510de9de79 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Fri, 31 May 2024 14:56:15 -0700 Subject: [PATCH 011/168] [service] remove deprecated Telemetry struct and New func (#10285) Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_rm-deprecated-telemetry.yaml | 25 +++++++++ service/telemetry/telemetry.go | 54 ------------------- service/telemetry/telemetry_test.go | 26 --------- 3 files changed, 25 insertions(+), 80 deletions(-) create mode 100644 .chloggen/codeboten_rm-deprecated-telemetry.yaml diff --git a/.chloggen/codeboten_rm-deprecated-telemetry.yaml b/.chloggen/codeboten_rm-deprecated-telemetry.yaml new file mode 100644 index 00000000000..81a7c6f112a --- /dev/null +++ b/.chloggen/codeboten_rm-deprecated-telemetry.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: service + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: remove deprecated Telemetry struct and New func + +# One or more tracking issues or pull requests related to the change +issues: [10285] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/service/telemetry/telemetry.go b/service/telemetry/telemetry.go index 53e36f3c76c..c9346c26d59 100644 --- a/service/telemetry/telemetry.go +++ b/service/telemetry/telemetry.go @@ -4,62 +4,8 @@ package telemetry // import "go.opentelemetry.io/collector/service/telemetry" import ( - "context" - "fmt" - - sdktrace "go.opentelemetry.io/otel/sdk/trace" - "go.opentelemetry.io/otel/trace" - "go.uber.org/multierr" - "go.uber.org/zap" - "go.opentelemetry.io/collector/service/telemetry/internal" ) -// Telemetry is the service telemetry. -// Deprecated: [v0.99.0] Use Factory. -type Telemetry struct { - logger *zap.Logger - tracerProvider trace.TracerProvider -} - -func (t *Telemetry) TracerProvider() trace.TracerProvider { - return t.tracerProvider -} - -func (t *Telemetry) Logger() *zap.Logger { - return t.logger -} - -func (t *Telemetry) Shutdown(ctx context.Context) error { - // TODO: Sync logger. - if tp, ok := t.tracerProvider.(*sdktrace.TracerProvider); ok { - return multierr.Combine( - tp.Shutdown(ctx), - ) - } - // should this return an error? - return nil -} - // Settings holds configuration for building Telemetry. type Settings = internal.CreateSettings - -// New creates a new Telemetry from Config. -// Deprecated: [v0.99.0] Use NewFactory. -func New(ctx context.Context, set Settings, cfg Config) (*Telemetry, error) { - f := NewFactory() - logger, err := f.CreateLogger(ctx, set, &cfg) - if err != nil { - return nil, fmt.Errorf("failed to created logger: %w", err) - } - - tracerProvider, err := f.CreateTracerProvider(ctx, set, &cfg) - if err != nil { - return nil, fmt.Errorf("failed to create tracer provider: %w", err) - } - - return &Telemetry{ - logger: logger, - tracerProvider: tracerProvider, - }, nil -} diff --git a/service/telemetry/telemetry_test.go b/service/telemetry/telemetry_test.go index 3a46c3cd8bc..25c42d01830 100644 --- a/service/telemetry/telemetry_test.go +++ b/service/telemetry/telemetry_test.go @@ -9,9 +9,6 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.opentelemetry.io/otel/trace" - "go.opentelemetry.io/otel/trace/noop" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -122,26 +119,3 @@ func TestSampledLogger(t *testing.T) { }) } } - -func TestTelemetryShutdown(t *testing.T) { - tests := []struct { - name string - provider trace.TracerProvider - wantErr error - }{ - { - name: "No provider", - }, - { - name: "Non-SDK provider", - provider: noop.NewTracerProvider(), - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - telemetry := Telemetry{tracerProvider: tt.provider} - err := telemetry.Shutdown(context.Background()) - require.Equal(t, tt.wantErr, err) - }) - } -} From 7dbaebb48f33cf707a069c67eed5b2b614e9913b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Mon, 3 Jun 2024 17:10:16 +0200 Subject: [PATCH 012/168] [confighttp] Apply MaxRequestBodySize to the result of a decompressed body (#10289) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change applies a restriction on the size of the decompressed payload. Before this change, this is the result of the test added in this PR: ``` --- FAIL: TestServerWithDecompression (0.03s) /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1327: Error Trace: /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1327 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/compression.go:163 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp.go:455 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/go/pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp@v0.52.0/handler.go:212 /home/jpkroehling/go/pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp@v0.52.0/handler.go:73 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/clientinfohandler.go:26 /usr/lib/golang/src/net/http/server.go:3137 /usr/lib/golang/src/net/http/server.go:2039 /usr/lib/golang/src/runtime/asm_amd64.s:1695 Error: An error is expected but got nil. Test: TestServerWithDecompression /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1328: Error Trace: /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1328 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/compression.go:163 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp.go:455 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/go/pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp@v0.52.0/handler.go:212 /home/jpkroehling/go/pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp@v0.52.0/handler.go:73 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/clientinfohandler.go:26 /usr/lib/golang/src/net/http/server.go:3137 /usr/lib/golang/src/net/http/server.go:2039 /usr/lib/golang/src/runtime/asm_amd64.s:1695 Error: Test: TestServerWithDecompression /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1357: Error Trace: /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1357 Error: Not equal: expected: 200 actual : 400 Test: TestServerWithDecompression FAIL FAIL go.opentelemetry.io/collector/config/confighttp 0.036s FAIL ``` Signed-off-by: Juraci Paixão Kröhling --------- Signed-off-by: Juraci Paixão Kröhling --- ..._set-maxrequestbodysize-to-compressed.yaml | 22 +++++ config/confighttp/compression.go | 16 ++-- config/confighttp/compression_test.go | 4 +- config/confighttp/confighttp.go | 9 +- config/confighttp/confighttp_test.go | 91 ++++++++++++++++++- 5 files changed, 130 insertions(+), 12 deletions(-) create mode 100644 .chloggen/jpkroehling_set-maxrequestbodysize-to-compressed.yaml diff --git a/.chloggen/jpkroehling_set-maxrequestbodysize-to-compressed.yaml b/.chloggen/jpkroehling_set-maxrequestbodysize-to-compressed.yaml new file mode 100644 index 00000000000..0d2ad5d82c1 --- /dev/null +++ b/.chloggen/jpkroehling_set-maxrequestbodysize-to-compressed.yaml @@ -0,0 +1,22 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'breaking' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confighttp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Apply MaxRequestBodySize to the result of a decompressed body + +# One or more tracking issues or pull requests related to the change +issues: [10289] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + When using compressed payloads, the Collector would verify only the size of the compressed payload. + This change applies the same restriction to the decompressed content. As a security measure, a limit of 20 MiB was added, which makes this a breaking change. + For most clients, this shouldn't be a problem, but if you often have payloads that decompress to more than 20 MiB, you might want to either configure your + client to send smaller batches (recommended), or increase the limit using the MaxRequestBodySize option. diff --git a/config/confighttp/compression.go b/config/confighttp/compression.go index 88ecafe78da..a700bec845b 100644 --- a/config/confighttp/compression.go +++ b/config/confighttp/compression.go @@ -67,24 +67,26 @@ func (r *compressRoundTripper) RoundTrip(req *http.Request) (*http.Response, err } type decompressor struct { - errHandler func(w http.ResponseWriter, r *http.Request, errorMsg string, statusCode int) - base http.Handler - decoders map[string]func(body io.ReadCloser) (io.ReadCloser, error) + errHandler func(w http.ResponseWriter, r *http.Request, errorMsg string, statusCode int) + base http.Handler + decoders map[string]func(body io.ReadCloser) (io.ReadCloser, error) + maxRequestBodySize int64 } // httpContentDecompressor offloads the task of handling compressed HTTP requests // by identifying the compression format in the "Content-Encoding" header and re-writing // request body so that the handlers further in the chain can work on decompressed data. // It supports gzip and deflate/zlib compression. -func httpContentDecompressor(h http.Handler, eh func(w http.ResponseWriter, r *http.Request, errorMsg string, statusCode int), decoders map[string]func(body io.ReadCloser) (io.ReadCloser, error)) http.Handler { +func httpContentDecompressor(h http.Handler, maxRequestBodySize int64, eh func(w http.ResponseWriter, r *http.Request, errorMsg string, statusCode int), decoders map[string]func(body io.ReadCloser) (io.ReadCloser, error)) http.Handler { errHandler := defaultErrorHandler if eh != nil { errHandler = eh } d := &decompressor{ - errHandler: errHandler, - base: h, + maxRequestBodySize: maxRequestBodySize, + errHandler: errHandler, + base: h, decoders: map[string]func(body io.ReadCloser) (io.ReadCloser, error){ "": func(io.ReadCloser) (io.ReadCloser, error) { // Not a compressed payload. Nothing to do. @@ -155,7 +157,7 @@ func (d *decompressor) ServeHTTP(w http.ResponseWriter, r *http.Request) { // "Content-Length" is set to -1 as the size of the decompressed body is unknown. r.Header.Del("Content-Length") r.ContentLength = -1 - r.Body = newBody + r.Body = http.MaxBytesReader(w, newBody, d.maxRequestBodySize) } d.base.ServeHTTP(w, r) } diff --git a/config/confighttp/compression_test.go b/config/confighttp/compression_test.go index 794adda2ec8..db2f7b3b3c0 100644 --- a/config/confighttp/compression_test.go +++ b/config/confighttp/compression_test.go @@ -134,7 +134,7 @@ func TestHTTPCustomDecompression(t *testing.T) { return io.NopCloser(strings.NewReader("decompressed body")), nil }, } - srv := httptest.NewServer(httpContentDecompressor(handler, defaultErrorHandler, decoders)) + srv := httptest.NewServer(httpContentDecompressor(handler, defaultMaxRequestBodySize, defaultErrorHandler, decoders)) t.Cleanup(srv.Close) @@ -253,7 +253,7 @@ func TestHTTPContentDecompressionHandler(t *testing.T) { require.NoError(t, err, "failed to read request body: %v", err) assert.EqualValues(t, testBody, string(body)) w.WriteHeader(http.StatusOK) - }), defaultErrorHandler, noDecoders)) + }), defaultMaxRequestBodySize, defaultErrorHandler, noDecoders)) t.Cleanup(srv.Close) req, err := http.NewRequest(http.MethodGet, srv.URL, tt.reqBody) diff --git a/config/confighttp/confighttp.go b/config/confighttp/confighttp.go index b210fa0dd8d..71b2f17ee2f 100644 --- a/config/confighttp/confighttp.go +++ b/config/confighttp/confighttp.go @@ -30,6 +30,7 @@ import ( ) const headerContentEncoding = "Content-Encoding" +const defaultMaxRequestBodySize = 20 * 1024 * 1024 // 20MiB // ClientConfig defines settings for creating an HTTP client. type ClientConfig struct { @@ -269,7 +270,7 @@ type ServerConfig struct { // Auth for this receiver Auth *configauth.Authentication `mapstructure:"auth"` - // MaxRequestBodySize sets the maximum request body size in bytes + // MaxRequestBodySize sets the maximum request body size in bytes. Default: 20MiB. MaxRequestBodySize int64 `mapstructure:"max_request_body_size"` // IncludeMetadata propagates the client metadata from the incoming requests to the downstream consumers @@ -340,7 +341,11 @@ func (hss *ServerConfig) ToServer(_ context.Context, host component.Host, settin o(serverOpts) } - handler = httpContentDecompressor(handler, serverOpts.errHandler, serverOpts.decoders) + if hss.MaxRequestBodySize <= 0 { + hss.MaxRequestBodySize = defaultMaxRequestBodySize + } + + handler = httpContentDecompressor(handler, hss.MaxRequestBodySize, serverOpts.errHandler, serverOpts.decoders) if hss.MaxRequestBodySize > 0 { handler = maxRequestBodySizeInterceptor(handler, hss.MaxRequestBodySize) diff --git a/config/confighttp/confighttp_test.go b/config/confighttp/confighttp_test.go index 635f9415a2f..99ac9a51201 100644 --- a/config/confighttp/confighttp_test.go +++ b/config/confighttp/confighttp_test.go @@ -4,6 +4,7 @@ package confighttp import ( + "bytes" "context" "errors" "fmt" @@ -13,6 +14,7 @@ import ( "net/http/httptest" "net/url" "path/filepath" + "strings" "testing" "time" @@ -1300,7 +1302,7 @@ func TestServerWithDecoder(t *testing.T) { // test response := &httptest.ResponseRecorder{} - req, err := http.NewRequest(http.MethodGet, srv.Addr, nil) + req, err := http.NewRequest(http.MethodGet, srv.Addr, bytes.NewBuffer([]byte("something"))) require.NoError(t, err, "Error creating request: %v", err) req.Header.Set("Content-Encoding", "something-else") @@ -1310,6 +1312,93 @@ func TestServerWithDecoder(t *testing.T) { } +func TestServerWithDecompression(t *testing.T) { + // prepare + hss := ServerConfig{ + MaxRequestBodySize: 1000, // 1 KB + } + body := []byte(strings.Repeat("a", 1000*1000)) // 1 MB + + srv, err := hss.ToServer( + context.Background(), + componenttest.NewNopHost(), + componenttest.NewNopTelemetrySettings(), + http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) { + actualBody, err := io.ReadAll(req.Body) + assert.ErrorContains(t, err, "http: request body too large") + assert.Len(t, actualBody, 1000) + + if err != nil { + resp.WriteHeader(http.StatusBadRequest) + } else { + resp.WriteHeader(http.StatusOK) + } + }), + ) + require.NoError(t, err) + + testSrv := httptest.NewServer(srv.Handler) + defer testSrv.Close() + + req, err := http.NewRequest(http.MethodGet, testSrv.URL, compressZstd(t, body)) + require.NoError(t, err, "Error creating request: %v", err) + + req.Header.Set("Content-Encoding", "zstd") + + // test + c := http.Client{} + resp, err := c.Do(req) + require.NoError(t, err, "Error sending request: %v", err) + + _, err = io.ReadAll(resp.Body) + require.NoError(t, err, "Error reading response body: %v", err) + + // verifications is done mostly within the test, but this is only a sanity check + // that we got into the test handler + assert.Equal(t, resp.StatusCode, http.StatusBadRequest) +} + +func TestDefaultMaxRequestBodySize(t *testing.T) { + tests := []struct { + name string + settings ServerConfig + expected int64 + }{ + { + name: "default", + settings: ServerConfig{}, + expected: defaultMaxRequestBodySize, + }, + { + name: "zero", + settings: ServerConfig{MaxRequestBodySize: 0}, + expected: defaultMaxRequestBodySize, + }, + { + name: "negative", + settings: ServerConfig{MaxRequestBodySize: -1}, + expected: defaultMaxRequestBodySize, + }, + { + name: "custom", + settings: ServerConfig{MaxRequestBodySize: 100}, + expected: 100, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + _, err := tt.settings.ToServer( + context.Background(), + componenttest.NewNopHost(), + componenttest.NewNopTelemetrySettings(), + http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}), + ) + require.NoError(t, err) + assert.Equal(t, tt.expected, tt.settings.MaxRequestBodySize) + }) + } +} + type mockHost struct { component.Host ext map[component.ID]component.Component From 5cbf8bebe4ad757f01974e9c65b853ddb7b28bba Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 3 Jun 2024 20:31:37 +0200 Subject: [PATCH 013/168] [chore] Prepare release v1.9.0/v0.102.0 (#10293) The following commands were run to prepare this release: - make chlog-update VERSION=v1.9.0/v0.102.0 - make prepare-release PREVIOUS_VERSION=1.8.0 RELEASE_CANDIDATE=1.9.0 MODSET=stable - make prepare-release PREVIOUS_VERSION=0.101.0 RELEASE_CANDIDATE=0.102.0 MODSET=beta --------- Co-authored-by: Pablo Baeyens --- .../codeboten_add-mdatagen-testutility.yaml | 25 ------ .chloggen/codeboten_fix-9674-2.yaml | 25 ------ .chloggen/codeboten_fix-9674.yaml | 25 ------ .../codeboten_fix-batchprocessor-bug.yaml | 25 ------ .../codeboten_mdatagen-telemetrylevel.yaml | 25 ------ .../codeboten_mdatagen-telemetrylevel2.yaml | 25 ------ ..._move-batchprocessortest-mdatagentest.yaml | 25 ------ .../codeboten_rm-deprecated-request.yaml | 25 ------ .../codeboten_rm-deprecated-telemetry.yaml | 25 ------ .../codeboten_rm-loadtlsconfigcontext.yaml | 25 ------ .chloggen/confmap-default-provider.yaml | 25 ------ .chloggen/doc-verify-images.yaml | 25 ------ .chloggen/embedded_struct_unmarshaler.yaml | 25 ------ .chloggen/env-var-name-verify.yaml | 25 ------ .../fix-batcher-sender-shutdown-deadlock.yaml | 20 ----- ..._set-maxrequestbodysize-to-compressed.yaml | 22 ----- .chloggen/mx-psi_tel-factory.yaml | 25 ------ .chloggen/otelcol-remove-deprecations.yaml | 25 ------ .chloggen/pcommon-string-int64-slices.yaml | 25 ------ .chloggen/profiles-pdata.yaml | 25 ------ .chloggen/remove_top_level_block.yaml | 25 ------ .chloggen/update-validate-command.yaml | 20 ----- CHANGELOG-API.md | 25 ++++++ CHANGELOG.md | 28 ++++++ cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 40 ++++----- cmd/builder/test/core.builder.yaml | 8 +- cmd/mdatagen/go.mod | 18 ++-- cmd/otelcorecol/builder-config.yaml | 40 ++++----- cmd/otelcorecol/go.mod | 88 +++++++++---------- cmd/otelcorecol/main.go | 2 +- component/go.mod | 6 +- config/configauth/go.mod | 12 +-- config/configgrpc/go.mod | 30 +++---- config/confighttp/go.mod | 26 +++--- config/configopaque/go.mod | 2 +- config/configtls/go.mod | 2 +- config/internal/go.mod | 4 +- confmap/converter/expandconverter/go.mod | 2 +- confmap/provider/envprovider/go.mod | 2 +- confmap/provider/fileprovider/go.mod | 2 +- confmap/provider/httpprovider/go.mod | 2 +- confmap/provider/httpsprovider/go.mod | 2 +- confmap/provider/yamlprovider/go.mod | 2 +- connector/forwardconnector/go.mod | 14 +-- connector/go.mod | 14 +-- consumer/go.mod | 4 +- exporter/debugexporter/go.mod | 22 ++--- exporter/go.mod | 20 ++--- exporter/loggingexporter/go.mod | 20 ++--- exporter/nopexporter/go.mod | 14 +-- exporter/otlpexporter/go.mod | 40 ++++----- exporter/otlphttpexporter/go.mod | 36 ++++---- extension/auth/go.mod | 10 +-- extension/ballastextension/go.mod | 12 +-- extension/go.mod | 8 +- extension/memorylimiterextension/go.mod | 12 +-- extension/zpagesextension/go.mod | 14 +-- filter/go.mod | 2 +- go.mod | 14 +-- internal/e2e/go.mod | 42 ++++----- otelcol/go.mod | 42 ++++----- pdata/pprofile/go.mod | 2 +- pdata/testdata/go.mod | 2 +- processor/batchprocessor/go.mod | 16 ++-- processor/go.mod | 14 +-- processor/memorylimiterprocessor/go.mod | 16 ++-- receiver/go.mod | 12 +-- receiver/nopreceiver/go.mod | 12 +-- receiver/otlpreceiver/go.mod | 38 ++++---- service/go.mod | 32 +++---- versions.yaml | 4 +- 72 files changed, 443 insertions(+), 927 deletions(-) delete mode 100644 .chloggen/codeboten_add-mdatagen-testutility.yaml delete mode 100644 .chloggen/codeboten_fix-9674-2.yaml delete mode 100644 .chloggen/codeboten_fix-9674.yaml delete mode 100644 .chloggen/codeboten_fix-batchprocessor-bug.yaml delete mode 100644 .chloggen/codeboten_mdatagen-telemetrylevel.yaml delete mode 100644 .chloggen/codeboten_mdatagen-telemetrylevel2.yaml delete mode 100644 .chloggen/codeboten_move-batchprocessortest-mdatagentest.yaml delete mode 100644 .chloggen/codeboten_rm-deprecated-request.yaml delete mode 100644 .chloggen/codeboten_rm-deprecated-telemetry.yaml delete mode 100644 .chloggen/codeboten_rm-loadtlsconfigcontext.yaml delete mode 100644 .chloggen/confmap-default-provider.yaml delete mode 100755 .chloggen/doc-verify-images.yaml delete mode 100644 .chloggen/embedded_struct_unmarshaler.yaml delete mode 100644 .chloggen/env-var-name-verify.yaml delete mode 100644 .chloggen/fix-batcher-sender-shutdown-deadlock.yaml delete mode 100644 .chloggen/jpkroehling_set-maxrequestbodysize-to-compressed.yaml delete mode 100644 .chloggen/mx-psi_tel-factory.yaml delete mode 100644 .chloggen/otelcol-remove-deprecations.yaml delete mode 100644 .chloggen/pcommon-string-int64-slices.yaml delete mode 100644 .chloggen/profiles-pdata.yaml delete mode 100644 .chloggen/remove_top_level_block.yaml delete mode 100644 .chloggen/update-validate-command.yaml diff --git a/.chloggen/codeboten_add-mdatagen-testutility.yaml b/.chloggen/codeboten_add-mdatagen-testutility.yaml deleted file mode 100644 index ef7b7616af1..00000000000 --- a/.chloggen/codeboten_add-mdatagen-testutility.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: auto-generate utilities to test component telemetry - -# One or more tracking issues or pull requests related to the change -issues: [19783] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_fix-9674-2.yaml b/.chloggen/codeboten_fix-9674-2.yaml deleted file mode 100644 index c51b1ad7b24..00000000000 --- a/.chloggen/codeboten_fix-9674-2.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: support setting an AttributeSet for async instruments - -# One or more tracking issues or pull requests related to the change -issues: [9674] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_fix-9674.yaml b/.chloggen/codeboten_fix-9674.yaml deleted file mode 100644 index 9243a82621a..00000000000 --- a/.chloggen/codeboten_fix-9674.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: batchprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: ensure attributes are set on cardinality metadata metric - -# One or more tracking issues or pull requests related to the change -issues: [9674] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_fix-batchprocessor-bug.yaml b/.chloggen/codeboten_fix-batchprocessor-bug.yaml deleted file mode 100644 index 4f91d27131e..00000000000 --- a/.chloggen/codeboten_fix-batchprocessor-bug.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: batchprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fixing processor_batch_metadata_cardinality which was broken in v0.101.0 - -# One or more tracking issues or pull requests related to the change -issues: [10231] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_mdatagen-telemetrylevel.yaml b/.chloggen/codeboten_mdatagen-telemetrylevel.yaml deleted file mode 100644 index 239fed8b0b4..00000000000 --- a/.chloggen/codeboten_mdatagen-telemetrylevel.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: support using telemetry level in telemetry builder - -# One or more tracking issues or pull requests related to the change -issues: [10234] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: This allows components to set the minimum level needed for them to produce telemetry. By default, this is set to configtelemetry.LevelBasic. If the telemetry level is below that minimum level, then the noop meter is used for metrics. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_mdatagen-telemetrylevel2.yaml b/.chloggen/codeboten_mdatagen-telemetrylevel2.yaml deleted file mode 100644 index 34a55fb964b..00000000000 --- a/.chloggen/codeboten_mdatagen-telemetrylevel2.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: batchprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: respect telemetry level for all metrics - -# One or more tracking issues or pull requests related to the change -issues: [10234] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_move-batchprocessortest-mdatagentest.yaml b/.chloggen/codeboten_move-batchprocessortest-mdatagentest.yaml deleted file mode 100644 index b297d7b51ea..00000000000 --- a/.chloggen/codeboten_move-batchprocessortest-mdatagentest.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: add support for bucket boundaries for histograms - -# One or more tracking issues or pull requests related to the change -issues: [10218] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_rm-deprecated-request.yaml b/.chloggen/codeboten_rm-deprecated-request.yaml deleted file mode 100644 index 57dd648a95d..00000000000 --- a/.chloggen/codeboten_rm-deprecated-request.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: remove deprecated RequestMarshaler & RequestUnmarshaler types - -# One or more tracking issues or pull requests related to the change -issues: [10283] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_rm-deprecated-telemetry.yaml b/.chloggen/codeboten_rm-deprecated-telemetry.yaml deleted file mode 100644 index 81a7c6f112a..00000000000 --- a/.chloggen/codeboten_rm-deprecated-telemetry.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: remove deprecated Telemetry struct and New func - -# One or more tracking issues or pull requests related to the change -issues: [10285] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_rm-loadtlsconfigcontext.yaml b/.chloggen/codeboten_rm-loadtlsconfigcontext.yaml deleted file mode 100644 index 8b8cbea7994..00000000000 --- a/.chloggen/codeboten_rm-loadtlsconfigcontext.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: configtls - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: remove deprecated LoadTLSConfigContext funcs - -# One or more tracking issues or pull requests related to the change -issues: [10283] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/confmap-default-provider.yaml b/.chloggen/confmap-default-provider.yaml deleted file mode 100644 index 2bc9fb28e67..00000000000 --- a/.chloggen/confmap-default-provider.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confmap - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Allow setting a default Provider on a Resolver to use when `${}` syntax is used without a scheme - -# One or more tracking issues or pull requests related to the change -issues: [10182] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/doc-verify-images.yaml b/.chloggen/doc-verify-images.yaml deleted file mode 100755 index 8509453829d..00000000000 --- a/.chloggen/doc-verify-images.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: releases - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: add documentation in how to verify the image signatures using cosign - -# One or more tracking issues or pull requests related to the change -issues: [9610] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/embedded_struct_unmarshaler.yaml b/.chloggen/embedded_struct_unmarshaler.yaml deleted file mode 100644 index 46b5c314a93..00000000000 --- a/.chloggen/embedded_struct_unmarshaler.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate `component.UnmarshalConfig`, use `(*confmap.Conf).Unmarshal(&intoCfg)` instead. - -# One or more tracking issues or pull requests related to the change -issues: [7102] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/env-var-name-verify.yaml b/.chloggen/env-var-name-verify.yaml deleted file mode 100644 index b0264aee6bd..00000000000 --- a/.chloggen/env-var-name-verify.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: envprovider - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Restricts Environment Variable names. Environment variable names must now be ASCII only and start with a letter or an underscore, and can only contain underscores, letters, or numbers. - -# One or more tracking issues or pull requests related to the change -issues: [9531] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: ['user'] diff --git a/.chloggen/fix-batcher-sender-shutdown-deadlock.yaml b/.chloggen/fix-batcher-sender-shutdown-deadlock.yaml deleted file mode 100644 index 76baecac6b5..00000000000 --- a/.chloggen/fix-batcher-sender-shutdown-deadlock.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix potential deadlocks in BatcherSender shutdown - -# One or more tracking issues or pull requests related to the change -issues: [10255] - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [user] diff --git a/.chloggen/jpkroehling_set-maxrequestbodysize-to-compressed.yaml b/.chloggen/jpkroehling_set-maxrequestbodysize-to-compressed.yaml deleted file mode 100644 index 0d2ad5d82c1..00000000000 --- a/.chloggen/jpkroehling_set-maxrequestbodysize-to-compressed.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: 'breaking' - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Apply MaxRequestBodySize to the result of a decompressed body - -# One or more tracking issues or pull requests related to the change -issues: [10289] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - When using compressed payloads, the Collector would verify only the size of the compressed payload. - This change applies the same restriction to the decompressed content. As a security measure, a limit of 20 MiB was added, which makes this a breaking change. - For most clients, this shouldn't be a problem, but if you often have payloads that decompress to more than 20 MiB, you might want to either configure your - client to send smaller batches (recommended), or increase the limit using the MaxRequestBodySize option. diff --git a/.chloggen/mx-psi_tel-factory.yaml b/.chloggen/mx-psi_tel-factory.yaml deleted file mode 100644 index 2a07ec8b46c..00000000000 --- a/.chloggen/mx-psi_tel-factory.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: service/telemetry - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate telemetry.New in favor of telemetry.NewFactory - -# One or more tracking issues or pull requests related to the change -issues: [4970] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/otelcol-remove-deprecations.yaml b/.chloggen/otelcol-remove-deprecations.yaml deleted file mode 100644 index 75dbd5313f9..00000000000 --- a/.chloggen/otelcol-remove-deprecations.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcol - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated `ConfigProvider` field from `CollectorSettings` - -# One or more tracking issues or pull requests related to the change -issues: [10281] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/pcommon-string-int64-slices.yaml b/.chloggen/pcommon-string-int64-slices.yaml deleted file mode 100644 index 9d3171ab671..00000000000 --- a/.chloggen/pcommon-string-int64-slices.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: pdata - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Introduce string and int64 slices to pcommon - -# One or more tracking issues or pull requests related to the change -issues: [10148] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/profiles-pdata.yaml b/.chloggen/profiles-pdata.yaml deleted file mode 100644 index bd8bf13065d..00000000000 --- a/.chloggen/profiles-pdata.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: pdata - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Introduce generated experimental pdata for profiling signal. - -# One or more tracking issues or pull requests related to the change -issues: [10195] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/remove_top_level_block.yaml b/.chloggen/remove_top_level_block.yaml deleted file mode 100644 index 811554a7e63..00000000000 --- a/.chloggen/remove_top_level_block.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confmap - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove top level condition when considering struct as Unmarshalers - -# One or more tracking issues or pull requests related to the change -issues: [7101] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/update-validate-command.yaml b/.chloggen/update-validate-command.yaml deleted file mode 100644 index db7b435fa56..00000000000 --- a/.chloggen/update-validate-command.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcol - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Update validate command to use the new configuration options - -# One or more tracking issues or pull requests related to the change -issues: [10203] - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/CHANGELOG-API.md b/CHANGELOG-API.md index 75d7a0e72fc..3851896f2cd 100644 --- a/CHANGELOG-API.md +++ b/CHANGELOG-API.md @@ -7,6 +7,31 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG +## v1.9.0/v0.102.0 + +### 🛑 Breaking changes 🛑 + +- `otelcol`: Remove deprecated `ConfigProvider` field from `CollectorSettings` (#10281) +- `exporterhelper`: remove deprecated RequestMarshaler & RequestUnmarshaler types (#10283) +- `service`: remove deprecated Telemetry struct and New func (#10285) +- `configtls`: remove deprecated LoadTLSConfigContext funcs (#10283) + +### 🚩 Deprecations 🚩 + +- `component`: Deprecate `component.UnmarshalConfig`, use `(*confmap.Conf).Unmarshal(&intoCfg)` instead. (#7102) +- `service/telemetry`: Deprecate telemetry.New in favor of telemetry.NewFactory (#4970) + +### 💡 Enhancements 💡 + +- `confmap`: Allow setting a default Provider on a Resolver to use when `${}` syntax is used without a scheme (#10182) +- `pdata`: Introduce string and int64 slices to pcommon (#10148) +- `pdata`: Introduce generated experimental pdata for profiling signal. (#10195) +- `confmap`: Remove top level condition when considering struct as Unmarshalers (#7101) + +### 🧰 Bug fixes 🧰 + +- `otelcol`: Update validate command to use the new configuration options (#10203) + ## v1.8.0/v0.101.0 ### 🛑 Breaking changes 🛑 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f738d7b86e..d8aa47185c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,34 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./ +## v1.9.0/v0.102.0 + +### 🛑 Breaking changes 🛑 + +- `envprovider`: Restricts Environment Variable names. Environment variable names must now be ASCII only and start with a letter or an underscore, and can only contain underscores, letters, or numbers. (#9531) +- `confighttp`: Apply MaxRequestBodySize to the result of a decompressed body (#10289) + When using compressed payloads, the Collector would verify only the size of the compressed payload. + This change applies the same restriction to the decompressed content. As a security measure, a limit of 20 MiB was added, which makes this a breaking change. + For most clients, this shouldn't be a problem, but if you often have payloads that decompress to more than 20 MiB, you might want to either configure your + client to send smaller batches (recommended), or increase the limit using the MaxRequestBodySize option. + + +### 💡 Enhancements 💡 + +- `mdatagen`: auto-generate utilities to test component telemetry (#19783) +- `mdatagen`: support setting an AttributeSet for async instruments (#9674) +- `mdatagen`: support using telemetry level in telemetry builder (#10234) + This allows components to set the minimum level needed for them to produce telemetry. By default, this is set to configtelemetry.LevelBasic. If the telemetry level is below that minimum level, then the noop meter is used for metrics. +- `mdatagen`: add support for bucket boundaries for histograms (#10218) +- `releases`: add documentation in how to verify the image signatures using cosign (#9610) + +### 🧰 Bug fixes 🧰 + +- `batchprocessor`: ensure attributes are set on cardinality metadata metric (#9674) +- `batchprocessor`: Fixing processor_batch_metadata_cardinality which was broken in v0.101.0 (#10231) +- `batchprocessor`: respect telemetry level for all metrics (#10234) +- `exporterhelper`: Fix potential deadlocks in BatcherSender shutdown (#10255) + ## v1.8.0/v0.101.0 ### 💡 Enhancements 💡 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 400aba4a095..823b2d6d6a6 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -17,7 +17,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.101.0" +const defaultOtelColVersion = "0.102.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 642c47f39fa..ef856ea9137 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,32 +2,32 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.101.0-dev - otelcol_version: 0.101.0 + version: 0.102.0-dev + otelcol_version: 0.102.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.101.0 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.101.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.101.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.101.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.101.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.101.0 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.101.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.101.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.0 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.101.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.101.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.101.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.0 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.101.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.101.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.101.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.101.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.101.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.0 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 4b2b8722001..cfe24f8e334 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.101.0 + otelcol_version: 0.102.0 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.101.0 + gomod: go.opentelemetry.io/collector v0.102.0 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.101.0 + gomod: go.opentelemetry.io/collector v0.102.0 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/debugexporter - gomod: go.opentelemetry.io/collector v0.101.0 + gomod: go.opentelemetry.io/collector v0.102.0 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index dc37e40c2ec..8134e9c77d5 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -5,15 +5,15 @@ go 1.21.0 require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/filter v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/receiver v0.101.0 - go.opentelemetry.io/collector/semconv v0.101.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/filter v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/receiver v0.102.0 + go.opentelemetry.io/collector/semconv v0.102.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 5d2c3049764..3f67cc06834 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,34 +2,34 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.101.0-dev - otelcol_version: 0.101.0 + version: 0.102.0-dev + otelcol_version: 0.102.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.101.0 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.101.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.101.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.101.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.101.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.101.0 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.101.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.101.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.0 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.101.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.101.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.101.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.0 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.101.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.101.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.101.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.101.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.101.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index dfbbf97ac84..2678acaaefc 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -7,33 +7,33 @@ go 1.21.0 toolchain go1.21.10 require ( - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.101.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.101.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.101.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.101.0 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.101.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.101.0 - go.opentelemetry.io/collector/connector v0.101.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.101.0 - go.opentelemetry.io/collector/exporter v0.101.0 - go.opentelemetry.io/collector/exporter/debugexporter v0.101.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.101.0 - go.opentelemetry.io/collector/exporter/nopexporter v0.101.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.101.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.0 - go.opentelemetry.io/collector/extension v0.101.0 - go.opentelemetry.io/collector/extension/ballastextension v0.101.0 - go.opentelemetry.io/collector/extension/memorylimiterextension v0.101.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.101.0 - go.opentelemetry.io/collector/otelcol v0.101.0 - go.opentelemetry.io/collector/processor v0.101.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.101.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.101.0 - go.opentelemetry.io/collector/receiver v0.101.0 - go.opentelemetry.io/collector/receiver/nopreceiver v0.101.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.0 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.0 + go.opentelemetry.io/collector/connector v0.102.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.102.0 + go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.102.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.102.0 + go.opentelemetry.io/collector/exporter/nopexporter v0.102.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.102.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.0 + go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector/extension/ballastextension v0.102.0 + go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.102.0 + go.opentelemetry.io/collector/otelcol v0.102.0 + go.opentelemetry.io/collector/processor v0.102.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.102.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.0 + go.opentelemetry.io/collector/receiver v0.102.0 + go.opentelemetry.io/collector/receiver/nopreceiver v0.102.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 golang.org/x/sys v0.20.0 ) @@ -79,23 +79,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.101.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.101.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.8.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.101.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.101.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.101.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.8.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.101.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.101.0 // indirect - go.opentelemetry.io/collector/config/internal v0.101.0 // indirect - go.opentelemetry.io/collector/consumer v0.101.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.101.0 // indirect - go.opentelemetry.io/collector/featuregate v1.8.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect - go.opentelemetry.io/collector/semconv v0.101.0 // indirect - go.opentelemetry.io/collector/service v0.101.0 // indirect + go.opentelemetry.io/collector v0.102.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.102.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.102.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.102.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.102.0 // indirect + go.opentelemetry.io/collector/config/internal v0.102.0 // indirect + go.opentelemetry.io/collector/consumer v0.102.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/semconv v0.102.0 // indirect + go.opentelemetry.io/collector/service v0.102.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index ba149146d71..b392b8478ed 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -21,7 +21,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.101.0-dev", + Version: "0.102.0-dev", } set := otelcol.CollectorSettings{ diff --git a/component/go.mod b/component/go.mod index cc94d24633c..1779928a047 100644 --- a/component/go.mod +++ b/component/go.mod @@ -7,9 +7,9 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.53.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/exporters/prometheus v0.49.0 go.opentelemetry.io/otel/metric v1.27.0 diff --git a/config/configauth/go.mod b/config/configauth/go.mod index c74f72787cc..4fb381869be 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -4,9 +4,9 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/extension v0.101.0 - go.opentelemetry.io/collector/extension/auth v0.101.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector/extension/auth v0.102.0 go.uber.org/goleak v1.3.0 ) @@ -20,9 +20,9 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/confmap v0.101.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index f86bb10bc4c..cca50c4ffc5 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -5,18 +5,18 @@ go 1.21.0 require ( github.com/mostynb/go-grpc-compression v1.2.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configauth v0.101.0 - go.opentelemetry.io/collector/config/configcompression v1.8.0 - go.opentelemetry.io/collector/config/confignet v0.101.0 - go.opentelemetry.io/collector/config/configopaque v1.8.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/config/configtls v0.101.0 - go.opentelemetry.io/collector/config/internal v0.101.0 - go.opentelemetry.io/collector/extension/auth v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configauth v0.102.0 + go.opentelemetry.io/collector/config/configcompression v1.9.0 + go.opentelemetry.io/collector/config/confignet v0.102.0 + go.opentelemetry.io/collector/config/configopaque v1.9.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/config/configtls v0.102.0 + go.opentelemetry.io/collector/config/internal v0.102.0 + go.opentelemetry.io/collector/extension/auth v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 @@ -49,9 +49,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.101.0 // indirect - go.opentelemetry.io/collector/extension v0.101.0 // indirect - go.opentelemetry.io/collector/featuregate v1.8.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 6031e7c1053..ccc480abee9 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -7,15 +7,15 @@ require ( github.com/klauspost/compress v1.17.8 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configauth v0.101.0 - go.opentelemetry.io/collector/config/configcompression v1.8.0 - go.opentelemetry.io/collector/config/configopaque v1.8.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/config/configtls v0.101.0 - go.opentelemetry.io/collector/config/internal v0.101.0 - go.opentelemetry.io/collector/extension/auth v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configauth v0.102.0 + go.opentelemetry.io/collector/config/configcompression v1.9.0 + go.opentelemetry.io/collector/config/configopaque v1.9.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/config/configtls v0.102.0 + go.opentelemetry.io/collector/config/internal v0.102.0 + go.opentelemetry.io/collector/extension/auth v0.102.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 @@ -44,10 +44,10 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.101.0 // indirect - go.opentelemetry.io/collector/extension v0.101.0 // indirect - go.opentelemetry.io/collector/featuregate v1.8.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect diff --git a/config/configopaque/go.mod b/config/configopaque/go.mod index de449cf9f9a..a7e1d8b16fc 100644 --- a/config/configopaque/go.mod +++ b/config/configopaque/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.101.0 + go.opentelemetry.io/collector/confmap v0.102.0 go.uber.org/goleak v1.3.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/config/configtls/go.mod b/config/configtls/go.mod index f5e97331737..ef6def16a96 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -5,7 +5,7 @@ go 1.21.0 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configopaque v1.8.0 + go.opentelemetry.io/collector/config/configopaque v1.9.0 ) require ( diff --git a/config/internal/go.mod b/config/internal/go.mod index 73bb4ff389a..58a6cd39ea3 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 + go.opentelemetry.io/collector v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -13,7 +13,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.8.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index 0e772edf1ea..a07898765bf 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.101.0 + go.opentelemetry.io/collector/confmap v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index 1b2d7a39ca1..6149ddd9f90 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.101.0 + go.opentelemetry.io/collector/confmap v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index 1d71b8fc838..3957af3d889 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.101.0 + go.opentelemetry.io/collector/confmap v0.102.0 go.uber.org/goleak v1.3.0 ) diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index 00ee22ac3ab..fb3bb4c2564 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.101.0 + go.opentelemetry.io/collector/confmap v0.102.0 go.uber.org/goleak v1.3.0 ) diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index 1ae5ccca81a..56d3a32d68b 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.101.0 + go.opentelemetry.io/collector/confmap v0.102.0 go.uber.org/goleak v1.3.0 ) diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index cfbf67c2e5f..8cdfedac27e 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.101.0 + go.opentelemetry.io/collector/confmap v0.102.0 go.uber.org/goleak v1.3.0 ) diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 443095c5ab0..ff8290dedfd 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,11 +4,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/connector v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/connector v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 go.uber.org/goleak v1.3.0 ) @@ -34,8 +34,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.101.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect + go.opentelemetry.io/collector v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/connector/go.mod b/connector/go.mod index 8e1fe0f62b8..79ea896c9e2 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -36,8 +36,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/confmap v0.101.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index 5cef78aa64f..95294696e4c 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -4,8 +4,8 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 go.uber.org/goleak v1.3.0 ) diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 1abf5c7a3eb..9d13f07b4ce 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -4,13 +4,13 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/exporter v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -38,10 +38,10 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.101.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.101.0 // indirect - go.opentelemetry.io/collector/extension v0.101.0 // indirect - go.opentelemetry.io/collector/receiver v0.101.0 // indirect + go.opentelemetry.io/collector v0.102.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.102.0 // indirect + go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/receiver v0.102.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/go.mod b/exporter/go.mod index 997091a8dec..dcb56b9c0a6 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,15 +6,15 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configretry v0.101.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/extension v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 - go.opentelemetry.io/collector/receiver v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configretry v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/receiver v0.102.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 @@ -48,7 +48,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.101.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/text v0.15.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 628494b5fb4..9797bcbfb54 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/exporter v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -37,11 +37,11 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.101.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.101.0 // indirect - go.opentelemetry.io/collector/consumer v0.101.0 // indirect - go.opentelemetry.io/collector/extension v0.101.0 // indirect - go.opentelemetry.io/collector/receiver v0.101.0 // indirect + go.opentelemetry.io/collector v0.102.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.102.0 // indirect + go.opentelemetry.io/collector/consumer v0.102.0 // indirect + go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/receiver v0.102.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index f289328e42e..8a6bbb8d2db 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -4,11 +4,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/exporter v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 go.uber.org/goleak v1.3.0 ) @@ -34,8 +34,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/receiver v0.101.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/receiver v0.102.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index fef731c2799..49ba938a326 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,19 +4,19 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configauth v0.101.0 - go.opentelemetry.io/collector/config/configcompression v1.8.0 - go.opentelemetry.io/collector/config/configgrpc v0.101.0 - go.opentelemetry.io/collector/config/configopaque v1.8.0 - go.opentelemetry.io/collector/config/configretry v0.101.0 - go.opentelemetry.io/collector/config/configtls v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/exporter v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configauth v0.102.0 + go.opentelemetry.io/collector/config/configcompression v1.9.0 + go.opentelemetry.io/collector/config/configgrpc v0.102.0 + go.opentelemetry.io/collector/config/configopaque v1.9.0 + go.opentelemetry.io/collector/config/configretry v0.102.0 + go.opentelemetry.io/collector/config/configtls v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -53,13 +53,13 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.101.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/config/internal v0.101.0 // indirect - go.opentelemetry.io/collector/extension v0.101.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.101.0 // indirect - go.opentelemetry.io/collector/featuregate v1.8.0 // indirect - go.opentelemetry.io/collector/receiver v0.101.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/internal v0.102.0 // indirect + go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/receiver v0.102.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index b129049ffe9..872a6c4820a 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,17 +4,17 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configcompression v1.8.0 - go.opentelemetry.io/collector/config/confighttp v0.101.0 - go.opentelemetry.io/collector/config/configopaque v1.8.0 - go.opentelemetry.io/collector/config/configretry v0.101.0 - go.opentelemetry.io/collector/config/configtls v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/exporter v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configcompression v1.9.0 + go.opentelemetry.io/collector/config/confighttp v0.102.0 + go.opentelemetry.io/collector/config/configopaque v1.9.0 + go.opentelemetry.io/collector/config/configretry v0.102.0 + go.opentelemetry.io/collector/config/configtls v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -52,13 +52,13 @@ require ( github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.101.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/config/internal v0.101.0 // indirect - go.opentelemetry.io/collector/extension v0.101.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.101.0 // indirect - go.opentelemetry.io/collector/featuregate v1.8.0 // indirect - go.opentelemetry.io/collector/receiver v0.101.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/internal v0.102.0 // indirect + go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/receiver v0.102.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 1696b175848..03b8df9e7ec 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -4,8 +4,8 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/extension v0.101.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/extension v0.102.0 go.uber.org/goleak v1.3.0 google.golang.org/grpc v1.64.0 ) @@ -28,9 +28,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/confmap v0.101.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 387edf602f4..ece09b10a0d 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -5,10 +5,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/extension v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/extension v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -39,8 +39,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/go.mod b/extension/go.mod index 325ec326913..4c0f8a46acc 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -5,8 +5,8 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 go.uber.org/goleak v1.3.0 ) @@ -28,8 +28,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 668e5b2179e..47b1513cc01 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/extension v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/extension v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -38,8 +38,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 9b52ad698d1..5907cb0e5df 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,11 +4,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/confignet v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/extension v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/confignet v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/extension v0.102.0 go.opentelemetry.io/contrib/zpages v0.52.0 go.opentelemetry.io/otel/sdk v1.27.0 go.opentelemetry.io/otel/trace v1.27.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect diff --git a/filter/go.mod b/filter/go.mod index 67969dc0f6c..144bedf107c 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.101.0 + go.opentelemetry.io/collector/confmap v0.102.0 ) require ( diff --git a/go.mod b/go.mod index df749db418d..b943394f1d9 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ go 1.21.0 require ( github.com/shirou/gopsutil/v3 v3.24.4 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/featuregate v1.8.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/featuregate v1.9.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 go.opentelemetry.io/contrib/config v0.7.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 @@ -48,7 +48,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index fd679a676c3..5bcd2da7ac7 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -4,19 +4,19 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configgrpc v0.101.0 - go.opentelemetry.io/collector/config/confighttp v0.101.0 - go.opentelemetry.io/collector/config/configretry v0.101.0 - go.opentelemetry.io/collector/config/configtls v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/exporter v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configgrpc v0.102.0 + go.opentelemetry.io/collector/config/confighttp v0.102.0 + go.opentelemetry.io/collector/config/configretry v0.102.0 + go.opentelemetry.io/collector/config/configtls v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/exporter v0.102.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.101.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 - go.opentelemetry.io/collector/receiver v0.101.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/receiver v0.102.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0 go.uber.org/goleak v1.3.0 ) @@ -52,16 +52,16 @@ require ( github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.101.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.8.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.101.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.8.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/config/internal v0.101.0 // indirect - go.opentelemetry.io/collector/confmap v0.101.0 // indirect - go.opentelemetry.io/collector/extension v0.101.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.101.0 // indirect - go.opentelemetry.io/collector/featuregate v1.8.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.102.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/internal v0.102.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index af023d98085..178b52042a8 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,22 +5,22 @@ go 1.21.0 require ( github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.101.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.101.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.101.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.101.0 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.101.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.101.0 - go.opentelemetry.io/collector/connector v0.101.0 - go.opentelemetry.io/collector/exporter v0.101.0 - go.opentelemetry.io/collector/extension v0.101.0 - go.opentelemetry.io/collector/featuregate v1.8.0 - go.opentelemetry.io/collector/processor v0.101.0 - go.opentelemetry.io/collector/receiver v0.101.0 - go.opentelemetry.io/collector/service v0.101.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.0 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.0 + go.opentelemetry.io/collector/connector v0.102.0 + go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector/featuregate v1.9.0 + go.opentelemetry.io/collector/processor v0.102.0 + go.opentelemetry.io/collector/receiver v0.102.0 + go.opentelemetry.io/collector/service v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -67,11 +67,11 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.101.0 // indirect - go.opentelemetry.io/collector/consumer v0.101.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.101.0 // indirect - go.opentelemetry.io/collector/semconv v0.101.0 // indirect + go.opentelemetry.io/collector v0.102.0 // indirect + go.opentelemetry.io/collector/consumer v0.102.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.102.0 // indirect + go.opentelemetry.io/collector/semconv v0.102.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod index 570b7439844..f3a7ba1375e 100644 --- a/pdata/pprofile/go.mod +++ b/pdata/pprofile/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.10 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.8.0 + go.opentelemetry.io/collector/pdata v1.9.0 ) require ( diff --git a/pdata/testdata/go.mod b/pdata/testdata/go.mod index b381445e434..547a6ba16e3 100644 --- a/pdata/testdata/go.mod +++ b/pdata/testdata/go.mod @@ -2,7 +2,7 @@ module go.opentelemetry.io/collector/pdata/testdata go 1.21.0 -require go.opentelemetry.io/collector/pdata v1.8.0 +require go.opentelemetry.io/collector/pdata v1.9.0 require ( github.com/gogo/protobuf v1.3.2 // indirect diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 4690e1a9928..b488e925549 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -4,14 +4,14 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 - go.opentelemetry.io/collector/processor v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/processor v0.102.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 diff --git a/processor/go.mod b/processor/go.mod index 070736d6e2b..0ed3bec0590 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -5,12 +5,12 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 @@ -40,7 +40,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.101.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 3af1f43fadf..9962cdcef09 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,12 +4,12 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/processor v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/processor v0.102.0 go.uber.org/goleak v1.3.0 ) @@ -42,8 +42,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.101.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.102.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/receiver/go.mod b/receiver/go.mod index ce8458b646a..c9116c4966e 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 @@ -41,7 +41,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.101.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/sys v0.20.0 // indirect diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index c9dcd311aa3..2ef1c1b7bbf 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/receiver v0.101.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/receiver v0.102.0 go.uber.org/goleak v1.3.0 ) @@ -33,8 +33,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/pdata v1.8.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 60edd412c1a..779a0e15731 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -6,17 +6,17 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/klauspost/compress v1.17.8 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/configgrpc v0.101.0 - go.opentelemetry.io/collector/config/confighttp v0.101.0 - go.opentelemetry.io/collector/config/confignet v0.101.0 - go.opentelemetry.io/collector/config/configtls v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 - go.opentelemetry.io/collector/receiver v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/configgrpc v0.102.0 + go.opentelemetry.io/collector/config/confighttp v0.102.0 + go.opentelemetry.io/collector/config/confignet v0.102.0 + go.opentelemetry.io/collector/config/configtls v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/receiver v0.102.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -53,14 +53,14 @@ require ( github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.101.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.8.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.8.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect - go.opentelemetry.io/collector/config/internal v0.101.0 // indirect - go.opentelemetry.io/collector/extension v0.101.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.101.0 // indirect - go.opentelemetry.io/collector/featuregate v1.8.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/internal v0.102.0 // indirect + go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/service/go.mod b/service/go.mod index 8936dad92f7..940b05d726e 100644 --- a/service/go.mod +++ b/service/go.mod @@ -10,22 +10,22 @@ require ( github.com/shirou/gopsutil/v3 v3.24.4 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.101.0 - go.opentelemetry.io/collector/component v0.101.0 - go.opentelemetry.io/collector/config/confignet v0.101.0 - go.opentelemetry.io/collector/config/configtelemetry v0.101.0 - go.opentelemetry.io/collector/confmap v0.101.0 - go.opentelemetry.io/collector/connector v0.101.0 - go.opentelemetry.io/collector/consumer v0.101.0 - go.opentelemetry.io/collector/exporter v0.101.0 - go.opentelemetry.io/collector/extension v0.101.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.101.0 - go.opentelemetry.io/collector/featuregate v1.8.0 - go.opentelemetry.io/collector/pdata v1.8.0 - go.opentelemetry.io/collector/pdata/testdata v0.101.0 - go.opentelemetry.io/collector/processor v0.101.0 - go.opentelemetry.io/collector/receiver v0.101.0 - go.opentelemetry.io/collector/semconv v0.101.0 + go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector/config/confignet v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/connector v0.102.0 + go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.102.0 + go.opentelemetry.io/collector/featuregate v1.9.0 + go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/processor v0.102.0 + go.opentelemetry.io/collector/receiver v0.102.0 + go.opentelemetry.io/collector/semconv v0.102.0 go.opentelemetry.io/contrib/config v0.7.0 go.opentelemetry.io/contrib/propagators/b3 v1.27.0 go.opentelemetry.io/otel v1.27.0 diff --git a/versions.yaml b/versions.yaml index 53adcb6b4f8..19cb0df39a0 100644 --- a/versions.yaml +++ b/versions.yaml @@ -3,14 +3,14 @@ module-sets: stable: - version: v1.8.0 + version: v1.9.0 modules: - go.opentelemetry.io/collector/featuregate - go.opentelemetry.io/collector/pdata - go.opentelemetry.io/collector/config/configopaque - go.opentelemetry.io/collector/config/configcompression beta: - version: v0.101.0 + version: v0.102.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder From c206e3ee9fda2426ab5f08a826dd2b2e20495c01 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 14:26:59 +0200 Subject: [PATCH 014/168] Update module github.com/prometheus/common to v0.54.0 (#10302) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/prometheus/common](https://togithub.com/prometheus/common) | `v0.53.0` -> `v0.54.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fprometheus%2fcommon/v0.54.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fprometheus%2fcommon/v0.54.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fprometheus%2fcommon/v0.53.0/v0.54.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fprometheus%2fcommon/v0.53.0/v0.54.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
prometheus/common (github.com/prometheus/common) ### [`v0.54.0`](https://togithub.com/prometheus/common/releases/tag/v0.54.0) [Compare Source](https://togithub.com/prometheus/common/compare/v0.53.0...v0.54.0) #### What's Changed - Bump golang.org/x/net from 0.22.0 to 0.23.0 in /sigv4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/624](https://togithub.com/prometheus/common/pull/624) - Bump golang.org/x/net from 0.22.0 to 0.23.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/623](https://togithub.com/prometheus/common/pull/623) - Add HTTP headers support to common HTTP client. by [@​roidelapluie](https://togithub.com/roidelapluie) in [https://github.com/prometheus/common/pull/416](https://togithub.com/prometheus/common/pull/416) - Synchronize common files from prometheus/prometheus by [@​prombot](https://togithub.com/prombot) in [https://github.com/prometheus/common/pull/633](https://togithub.com/prometheus/common/pull/633) - Bump github.com/aws/aws-sdk-go from 1.51.11 to 1.51.32 in /sigv4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/632](https://togithub.com/prometheus/common/pull/632) - Bump golang.org/x/oauth2 from 0.18.0 to 0.19.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/628](https://togithub.com/prometheus/common/pull/628) - Bump golang.org/x/net from 0.23.0 to 0.24.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/630](https://togithub.com/prometheus/common/pull/630) - Bump github.com/prometheus/client_model from 0.6.0 to 0.6.1 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/631](https://togithub.com/prometheus/common/pull/631) - Bump google.golang.org/protobuf from 1.33.0 to 1.34.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/629](https://togithub.com/prometheus/common/pull/629) - Use common interface to fetch secrets in HTTP client config by [@​TheSpiritXIII](https://togithub.com/TheSpiritXIII) in [https://github.com/prometheus/common/pull/538](https://togithub.com/prometheus/common/pull/538) - Add support for secret refs via a secret manager by [@​TheSpiritXIII](https://togithub.com/TheSpiritXIII) in [https://github.com/prometheus/common/pull/572](https://togithub.com/prometheus/common/pull/572) - oauth2RoundTripper: Avoid race condition and readability changes. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/prometheus/common/pull/634](https://togithub.com/prometheus/common/pull/634) - Synchronize common files from prometheus/prometheus by [@​prombot](https://togithub.com/prombot) in [https://github.com/prometheus/common/pull/636](https://togithub.com/prometheus/common/pull/636) - Bump github.com/aws/aws-sdk-go from 1.51.32 to 1.53.14 in /sigv4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/638](https://togithub.com/prometheus/common/pull/638) - Bump github.com/prometheus/client_golang from 1.19.0 to 1.19.1 in /sigv4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/639](https://togithub.com/prometheus/common/pull/639) - feat: add time template helpers by [@​freak12techno](https://togithub.com/freak12techno) in [https://github.com/prometheus/common/pull/627](https://togithub.com/prometheus/common/pull/627) #### New Contributors - [@​bwplotka](https://togithub.com/bwplotka) made their first contribution in [https://github.com/prometheus/common/pull/634](https://togithub.com/prometheus/common/pull/634) - [@​freak12techno](https://togithub.com/freak12techno) made their first contribution in [https://github.com/prometheus/common/pull/627](https://togithub.com/prometheus/common/pull/627) **Full Changelog**: https://github.com/prometheus/common/compare/v0.53.0...v0.54.0
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/mdatagen/go.mod | 2 +- cmd/mdatagen/go.sum | 4 ++-- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- component/go.mod | 4 ++-- component/go.sum | 8 ++++---- config/configauth/go.mod | 2 +- config/configauth/go.sum | 8 ++++---- config/configgrpc/go.mod | 2 +- config/configgrpc/go.sum | 4 ++-- config/confighttp/go.mod | 2 +- config/confighttp/go.sum | 4 ++-- connector/forwardconnector/go.mod | 2 +- connector/forwardconnector/go.sum | 4 ++-- connector/go.mod | 2 +- connector/go.sum | 4 ++-- exporter/debugexporter/go.mod | 2 +- exporter/debugexporter/go.sum | 4 ++-- exporter/go.mod | 2 +- exporter/go.sum | 4 ++-- exporter/loggingexporter/go.mod | 2 +- exporter/loggingexporter/go.sum | 4 ++-- exporter/nopexporter/go.mod | 2 +- exporter/nopexporter/go.sum | 4 ++-- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- extension/auth/go.mod | 4 ++-- extension/auth/go.sum | 8 ++++---- extension/ballastextension/go.mod | 2 +- extension/ballastextension/go.sum | 4 ++-- extension/go.mod | 4 ++-- extension/go.sum | 8 ++++---- extension/memorylimiterextension/go.mod | 2 +- extension/memorylimiterextension/go.sum | 4 ++-- extension/zpagesextension/go.mod | 2 +- extension/zpagesextension/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- internal/e2e/go.mod | 2 +- internal/e2e/go.sum | 4 ++-- otelcol/go.mod | 2 +- otelcol/go.sum | 4 ++-- processor/batchprocessor/go.mod | 2 +- processor/batchprocessor/go.sum | 4 ++-- processor/go.mod | 2 +- processor/go.sum | 4 ++-- processor/memorylimiterprocessor/go.mod | 2 +- processor/memorylimiterprocessor/go.sum | 4 ++-- receiver/go.mod | 2 +- receiver/go.sum | 4 ++-- receiver/nopreceiver/go.mod | 2 +- receiver/nopreceiver/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- service/go.mod | 2 +- service/go.sum | 4 ++-- 58 files changed, 98 insertions(+), 98 deletions(-) diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 8134e9c77d5..eaa05254d91 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -43,7 +43,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index c2df9c2579c..ace4d10d26a 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -48,8 +48,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 2678acaaefc..2a80c78c762 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -68,7 +68,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/shirou/gopsutil/v3 v3.24.4 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index cb8ee7f11f2..8860b535ede 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -106,8 +106,8 @@ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJL github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/component/go.mod b/component/go.mod index 1779928a047..17e988936b0 100644 --- a/component/go.mod +++ b/component/go.mod @@ -5,7 +5,7 @@ go 1.21.0 require ( github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.1 - github.com/prometheus/common v0.53.0 + github.com/prometheus/common v0.54.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/config/configtelemetry v0.102.0 go.opentelemetry.io/collector/confmap v0.102.0 @@ -36,7 +36,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect diff --git a/component/go.sum b/component/go.sum index df6137c7eb0..000c077e9bc 100644 --- a/component/go.sum +++ b/component/go.sum @@ -37,8 +37,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -74,8 +74,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 4fb381869be..21093599bc7 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -28,7 +28,7 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect diff --git a/config/configauth/go.sum b/config/configauth/go.sum index 2ce16fd9245..f058d94d6ae 100644 --- a/config/configauth/go.sum +++ b/config/configauth/go.sum @@ -36,8 +36,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -73,8 +73,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index cca50c4ffc5..f48c225d577 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -47,7 +47,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/confmap v0.102.0 // indirect go.opentelemetry.io/collector/extension v0.102.0 // indirect diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index 2e2a2d31466..dc78c6d50d7 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -56,8 +56,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index ccc480abee9..120292bbdff 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -42,7 +42,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/confmap v0.102.0 // indirect go.opentelemetry.io/collector/extension v0.102.0 // indirect diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index b200e478308..131fcda45d8 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -53,8 +53,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index ff8290dedfd..e2f1849fe5c 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -32,7 +32,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector v0.102.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index c2df9c2579c..ace4d10d26a 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -48,8 +48,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/connector/go.mod b/connector/go.mod index 79ea896c9e2..1cdebabc374 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -34,7 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect go.opentelemetry.io/collector/confmap v0.102.0 // indirect diff --git a/connector/go.sum b/connector/go.sum index c2df9c2579c..ace4d10d26a 100644 --- a/connector/go.sum +++ b/connector/go.sum @@ -48,8 +48,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 9d13f07b4ce..3caf9742d16 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -36,7 +36,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector v0.102.0 // indirect go.opentelemetry.io/collector/config/configretry v0.102.0 // indirect diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index 31bd5593265..89c04519593 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -50,8 +50,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/exporter/go.mod b/exporter/go.mod index dcb56b9c0a6..816380f77bf 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -46,7 +46,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/confmap v0.102.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/exporter/go.sum b/exporter/go.sum index 31bd5593265..89c04519593 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -50,8 +50,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 9797bcbfb54..ef96c03f2db 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -35,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector v0.102.0 // indirect go.opentelemetry.io/collector/config/configretry v0.102.0 // indirect diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 31bd5593265..89c04519593 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -50,8 +50,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index 8a6bbb8d2db..d4968af039c 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -32,7 +32,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect go.opentelemetry.io/collector/receiver v0.102.0 // indirect diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index 31bd5593265..89c04519593 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -50,8 +50,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 49ba938a326..8137e2e0452 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -51,7 +51,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/confignet v0.102.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 73edf49af8e..10cff0235fc 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -62,8 +62,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 872a6c4820a..639f5a3792f 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -49,7 +49,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 23d45b02bfb..b05c4da6339 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -62,8 +62,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 03b8df9e7ec..ecb87ade477 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -26,7 +26,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect go.opentelemetry.io/collector/confmap v0.102.0 // indirect @@ -39,7 +39,7 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect diff --git a/extension/auth/go.sum b/extension/auth/go.sum index df6137c7eb0..000c077e9bc 100644 --- a/extension/auth/go.sum +++ b/extension/auth/go.sum @@ -37,8 +37,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -74,8 +74,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index ece09b10a0d..b9245eba80c 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -33,7 +33,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/shirou/gopsutil/v3 v3.24.4 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index 412e23369a7..6a8860d5e18 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -48,8 +48,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/extension/go.mod b/extension/go.mod index 4c0f8a46acc..7d6d05b7687 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -26,7 +26,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect @@ -38,7 +38,7 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect diff --git a/extension/go.sum b/extension/go.sum index 2c9ec8b1a08..3ca262fb778 100644 --- a/extension/go.sum +++ b/extension/go.sum @@ -39,8 +39,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -76,8 +76,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 47b1513cc01..1a40d48a0cb 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -32,7 +32,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/shirou/gopsutil/v3 v3.24.4 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index 412e23369a7..6a8860d5e18 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -48,8 +48,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 5907cb0e5df..12a2bc27242 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -35,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index a863831d1d2..175064a2c97 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -43,8 +43,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/go.mod b/go.mod index b943394f1d9..1344c07b81f 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect diff --git a/go.sum b/go.sum index beb61dfc4d1..36fc51333b1 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 5bcd2da7ac7..a5ed312b3a4 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -49,7 +49,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 0dca59da058..900d2014b04 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -64,8 +64,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/otelcol/go.mod b/otelcol/go.mod index 178b52042a8..fc78e45841d 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -58,7 +58,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/shirou/gopsutil/v3 v3.24.4 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index 6c46ac8b08a..6c51ffbcc4d 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -96,8 +96,8 @@ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJL github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index b488e925549..c29eef965fb 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -40,7 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index c2df9c2579c..ace4d10d26a 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -48,8 +48,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/processor/go.mod b/processor/go.mod index 0ed3bec0590..de9d00ca672 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -38,7 +38,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/confmap v0.102.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/processor/go.sum b/processor/go.sum index c2df9c2579c..ace4d10d26a 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -48,8 +48,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 9962cdcef09..953712bd469 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -36,7 +36,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/shirou/gopsutil/v3 v3.24.4 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 8c3cf825d2f..025936b8d10 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -56,8 +56,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/receiver/go.mod b/receiver/go.mod index c9116c4966e..5b2c88f86b5 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -39,7 +39,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/confmap v0.102.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/receiver/go.sum b/receiver/go.sum index c2df9c2579c..ace4d10d26a 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -48,8 +48,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index 2ef1c1b7bbf..249483cd99c 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -31,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect diff --git a/receiver/nopreceiver/go.sum b/receiver/nopreceiver/go.sum index c2df9c2579c..ace4d10d26a 100644 --- a/receiver/nopreceiver/go.sum +++ b/receiver/nopreceiver/go.sum @@ -48,8 +48,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 779a0e15731..1c948eff723 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -50,7 +50,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 0dca59da058..900d2014b04 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -64,8 +64,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/service/go.mod b/service/go.mod index 940b05d726e..a751d607f96 100644 --- a/service/go.mod +++ b/service/go.mod @@ -6,7 +6,7 @@ require ( github.com/google/uuid v1.6.0 github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.1 - github.com/prometheus/common v0.53.0 + github.com/prometheus/common v0.54.0 github.com/shirou/gopsutil/v3 v3.24.4 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 diff --git a/service/go.sum b/service/go.sum index 6c7bface428..1553789a234 100644 --- a/service/go.sum +++ b/service/go.sum @@ -93,8 +93,8 @@ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJL github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= From d822b510c95a18f36de8be4bdbf7f06c37bdc3bc Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Tue, 4 Jun 2024 16:12:24 +0200 Subject: [PATCH 015/168] Document TLS option Watch client CA (#10254) It documents already implemented option https://github.com/open-telemetry/opentelemetry-collector/blob/06424935fda1b1e07171ae20f6cde3da02e54e27/config/configtls/configtls.go#L127 --------- Signed-off-by: Pavol Loffay Co-authored-by: Bogdan Drutu Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- config/configtls/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/config/configtls/README.md b/config/configtls/README.md index aecfc284b41..cdc8d31663b 100644 --- a/config/configtls/README.md +++ b/config/configtls/README.md @@ -122,6 +122,7 @@ Beyond TLS configuration, the following setting can optionally be configured client certificate. (optional) This sets the ClientCAs and ClientAuth to RequireAndVerifyClientCert in the TLSConfig. Please refer to https://godoc.org/crypto/tls#Config for more information. +- `client_ca_file_reload` (default = false): Reload the ClientCAs file when it is modified. Example: From 6994059b2cef88e85b19e0e6e8e56a10df3e8e68 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 4 Jun 2024 14:12:49 +0000 Subject: [PATCH 016/168] [chore] Update release schedule (#10305) Update release schedule. Relates to #10294 --- docs/release.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/release.md b/docs/release.md index 20776c31c51..0207eefbdbb 100644 --- a/docs/release.md +++ b/docs/release.md @@ -158,8 +158,6 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR | Date | Version | Release manager | |------------|----------|-----------------| -| 2024-05-20 | v0.101.0 | @jpkrohling | -| 2024-06-03 | v0.102.0 | @mx-psi | | 2024-06-17 | v0.103.0 | @djaglowski | | 2024-07-01 | v0.104.0 | @atoulme | | 2024-07-15 | v0.105.0 | @TylerHelmuth | @@ -167,3 +165,5 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR | 2024-08-12 | v0.107.0 | @dmitryax | | 2024-08-26 | v0.108.0 | @codeboten | | 2024-09-09 | v0.109.0 | @bogdandrutu | +| 2024-09-23 | v0.110.0 | @jpkrohling | +| 2024-10-07 | v0.111.0 | @mx-psi | From a6fdb11d1b1ea07cd939935beeaf98839e7a2e28 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 07:13:51 -0700 Subject: [PATCH 017/168] Update github/codeql-action action to v3.25.7 (#10299) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github/codeql-action](https://togithub.com/github/codeql-action) | action | patch | `v3.25.6` -> `v3.25.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
github/codeql-action (github/codeql-action) ### [`v3.25.7`](https://togithub.com/github/codeql-action/compare/v3.25.6...v3.25.7) [Compare Source](https://togithub.com/github/codeql-action/compare/v3.25.6...v3.25.7)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecard.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index bb456aade19..f162ccc024d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,12 +30,12 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 + uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 with: languages: go - name: Autobuild - uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 + uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 + uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index c9c952f5829..78a7ffb9ec8 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -64,6 +64,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 + uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 with: sarif_file: results.sarif From c0e8a0b262af3a8208b2f02d2e3f8619379cf2da Mon Sep 17 00:00:00 2001 From: Akhigbe Eromosele David Date: Tue, 4 Jun 2024 15:59:47 +0100 Subject: [PATCH 018/168] Updated public methods in configauth (#9880) Added context.Context to the following functions: - GetClientAuthenticator - GetServerAuthenticator Link to the issue: https://github.com/open-telemetry/opentelemetry-collector/issues/9808 --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- ...onfigauth-add-context-to-public-funcs.yaml | 25 +++++++++++++++++++ config/configauth/configauth.go | 18 +++++++++++-- config/configauth/configauth_test.go | 9 ++++--- config/configgrpc/configgrpc.go | 12 ++++----- config/configgrpc/configgrpc_test.go | 6 ++--- config/confighttp/confighttp.go | 4 +-- 6 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 .chloggen/configauth-add-context-to-public-funcs.yaml diff --git a/.chloggen/configauth-add-context-to-public-funcs.yaml b/.chloggen/configauth-add-context-to-public-funcs.yaml new file mode 100644 index 00000000000..01589081b0d --- /dev/null +++ b/.chloggen/configauth-add-context-to-public-funcs.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: configauth + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate `GetClientAuthenticator` and `GetServerAuthenticator`, use `GetClientAuthenticatorContext` and `GetServerAuthenticatorContext` instead. + +# One or more tracking issues or pull requests related to the change +issues: [9808] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] \ No newline at end of file diff --git a/config/configauth/configauth.go b/config/configauth/configauth.go index aa7002c270b..dc275f705e0 100644 --- a/config/configauth/configauth.go +++ b/config/configauth/configauth.go @@ -7,6 +7,7 @@ package configauth // import "go.opentelemetry.io/collector/config/configauth" import ( + "context" "errors" "fmt" @@ -33,7 +34,15 @@ func NewDefaultAuthentication() *Authentication { // GetServerAuthenticator attempts to select the appropriate auth.Server from the list of extensions, // based on the requested extension name. If an authenticator is not found, an error is returned. +// +// Deprecated: [v0.103.0] Use GetServerAuthenticatorContext instead. func (a Authentication) GetServerAuthenticator(extensions map[component.ID]component.Component) (auth.Server, error) { + return a.GetServerAuthenticatorContext(context.Background(), extensions) +} + +// GetServerAuthenticatorContext attempts to select the appropriate auth.Server from the list of extensions, +// based on the requested extension name. If an authenticator is not found, an error is returned. +func (a Authentication) GetServerAuthenticatorContext(_ context.Context, extensions map[component.ID]component.Component) (auth.Server, error) { if ext, found := extensions[a.AuthenticatorID]; found { if server, ok := ext.(auth.Server); ok { return server, nil @@ -44,10 +53,15 @@ func (a Authentication) GetServerAuthenticator(extensions map[component.ID]compo return nil, fmt.Errorf("failed to resolve authenticator %q: %w", a.AuthenticatorID, errAuthenticatorNotFound) } -// GetClientAuthenticator attempts to select the appropriate auth.Client from the list of extensions, +// Deprecated: [v0.103.0] Use GetClientAuthenticatorContext instead. +func (a Authentication) GetClientAuthenticator(extensions map[component.ID]component.Component) (auth.Client, error) { + return a.GetClientAuthenticatorContext(context.Background(), extensions) +} + +// GetClientAuthenticatorContext attempts to select the appropriate auth.Client from the list of extensions, // based on the component id of the extension. If an authenticator is not found, an error is returned. // This should be only used by HTTP clients. -func (a Authentication) GetClientAuthenticator(extensions map[component.ID]component.Component) (auth.Client, error) { +func (a Authentication) GetClientAuthenticatorContext(_ context.Context, extensions map[component.ID]component.Component) (auth.Client, error) { if ext, found := extensions[a.AuthenticatorID]; found { if client, ok := ext.(auth.Client); ok { return client, nil diff --git a/config/configauth/configauth_test.go b/config/configauth/configauth_test.go index e16289a1490..5e721fec9a9 100644 --- a/config/configauth/configauth_test.go +++ b/config/configauth/configauth_test.go @@ -4,6 +4,7 @@ package configauth import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -48,7 +49,7 @@ func TestGetServer(t *testing.T) { mockID: tC.authenticator, } - authenticator, err := cfg.GetServerAuthenticator(ext) + authenticator, err := cfg.GetServerAuthenticatorContext(context.Background(), ext) // verify if tC.expected != nil { @@ -67,7 +68,7 @@ func TestGetServerFails(t *testing.T) { AuthenticatorID: component.MustNewID("does_not_exist"), } - authenticator, err := cfg.GetServerAuthenticator(map[component.ID]component.Component{}) + authenticator, err := cfg.GetServerAuthenticatorContext(context.Background(), map[component.ID]component.Component{}) assert.ErrorIs(t, err, errAuthenticatorNotFound) assert.Nil(t, authenticator) } @@ -99,7 +100,7 @@ func TestGetClient(t *testing.T) { mockID: tC.authenticator, } - authenticator, err := cfg.GetClientAuthenticator(ext) + authenticator, err := cfg.GetClientAuthenticatorContext(context.Background(), ext) // verify if tC.expected != nil { @@ -117,7 +118,7 @@ func TestGetClientFails(t *testing.T) { cfg := &Authentication{ AuthenticatorID: component.MustNewID("does_not_exist"), } - authenticator, err := cfg.GetClientAuthenticator(map[component.ID]component.Component{}) + authenticator, err := cfg.GetClientAuthenticatorContext(context.Background(), map[component.ID]component.Component{}) assert.ErrorIs(t, err, errAuthenticatorNotFound) assert.Nil(t, authenticator) } diff --git a/config/configgrpc/configgrpc.go b/config/configgrpc/configgrpc.go index 98d428857ce..87e7b83d766 100644 --- a/config/configgrpc/configgrpc.go +++ b/config/configgrpc/configgrpc.go @@ -218,8 +218,8 @@ func (gcs *ClientConfig) isSchemeHTTPS() bool { // a non-blocking dial (the function won't wait for connections to be // established, and connecting happens in the background). To make it a blocking // dial, use grpc.WithBlock() dial option. -func (gcs *ClientConfig) ToClientConn(_ context.Context, host component.Host, settings component.TelemetrySettings, extraOpts ...grpc.DialOption) (*grpc.ClientConn, error) { - opts, err := gcs.toDialOptions(host, settings) +func (gcs *ClientConfig) ToClientConn(ctx context.Context, host component.Host, settings component.TelemetrySettings, extraOpts ...grpc.DialOption) (*grpc.ClientConn, error) { + opts, err := gcs.toDialOptions(ctx, host, settings) if err != nil { return nil, err } @@ -227,7 +227,7 @@ func (gcs *ClientConfig) ToClientConn(_ context.Context, host component.Host, se return grpc.NewClient(gcs.sanitizedEndpoint(), opts...) } -func (gcs *ClientConfig) toDialOptions(host component.Host, settings component.TelemetrySettings) ([]grpc.DialOption, error) { +func (gcs *ClientConfig) toDialOptions(ctx context.Context, host component.Host, settings component.TelemetrySettings) ([]grpc.DialOption, error) { var opts []grpc.DialOption if gcs.Compression.IsCompressed() { cp, err := getGRPCCompressionName(gcs.Compression) @@ -237,7 +237,7 @@ func (gcs *ClientConfig) toDialOptions(host component.Host, settings component.T opts = append(opts, grpc.WithDefaultCallOptions(grpc.UseCompressor(cp))) } - tlsCfg, err := gcs.TLSSetting.LoadTLSConfig(context.Background()) + tlsCfg, err := gcs.TLSSetting.LoadTLSConfig(ctx) if err != nil { return nil, err } @@ -271,7 +271,7 @@ func (gcs *ClientConfig) toDialOptions(host component.Host, settings component.T return nil, errors.New("no extensions configuration available") } - grpcAuthenticator, cerr := gcs.Auth.GetClientAuthenticator(host.GetExtensions()) + grpcAuthenticator, cerr := gcs.Auth.GetClientAuthenticatorContext(ctx, host.GetExtensions()) if cerr != nil { return nil, cerr } @@ -387,7 +387,7 @@ func (gss *ServerConfig) toServerOption(host component.Host, settings component. var sInterceptors []grpc.StreamServerInterceptor if gss.Auth != nil { - authenticator, err := gss.Auth.GetServerAuthenticator(host.GetExtensions()) + authenticator, err := gss.Auth.GetServerAuthenticatorContext(context.Background(), host.GetExtensions()) if err != nil { return nil, err } diff --git a/config/configgrpc/configgrpc_test.go b/config/configgrpc/configgrpc_test.go index 6f0a98aa382..c6009d347f8 100644 --- a/config/configgrpc/configgrpc_test.go +++ b/config/configgrpc/configgrpc_test.go @@ -121,7 +121,7 @@ func TestDefaultGrpcClientSettings(t *testing.T) { Insecure: true, }, } - opts, err := gcs.toDialOptions(componenttest.NewNopHost(), tt.TelemetrySettings()) + opts, err := gcs.toDialOptions(context.Background(), componenttest.NewNopHost(), tt.TelemetrySettings()) assert.NoError(t, err) assert.Len(t, opts, 2) } @@ -226,7 +226,7 @@ func TestAllGrpcClientSettings(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(t *testing.T) { - opts, err := test.settings.toDialOptions(test.host, tt.TelemetrySettings()) + opts, err := test.settings.toDialOptions(context.Background(), test.host, tt.TelemetrySettings()) assert.NoError(t, err) assert.Len(t, opts, 9) }) @@ -431,7 +431,7 @@ func TestUseSecure(t *testing.T) { TLSSetting: configtls.ClientConfig{}, Keepalive: nil, } - dialOpts, err := gcs.toDialOptions(componenttest.NewNopHost(), tt.TelemetrySettings()) + dialOpts, err := gcs.toDialOptions(context.Background(), componenttest.NewNopHost(), tt.TelemetrySettings()) assert.NoError(t, err) assert.Len(t, dialOpts, 2) } diff --git a/config/confighttp/confighttp.go b/config/confighttp/confighttp.go index 71b2f17ee2f..f89f8c6ea0f 100644 --- a/config/confighttp/confighttp.go +++ b/config/confighttp/confighttp.go @@ -181,7 +181,7 @@ func (hcs *ClientConfig) ToClient(ctx context.Context, host component.Host, sett return nil, errors.New("extensions configuration not found") } - httpCustomAuthRoundTripper, aerr := hcs.Auth.GetClientAuthenticator(ext) + httpCustomAuthRoundTripper, aerr := hcs.Auth.GetClientAuthenticatorContext(ctx, ext) if aerr != nil { return nil, aerr } @@ -352,7 +352,7 @@ func (hss *ServerConfig) ToServer(_ context.Context, host component.Host, settin } if hss.Auth != nil { - server, err := hss.Auth.GetServerAuthenticator(host.GetExtensions()) + server, err := hss.Auth.GetServerAuthenticatorContext(context.Background(), host.GetExtensions()) if err != nil { return nil, err } From 15faf6206bedc9d5a188f131fc5891904e29a34b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 08:00:18 -0700 Subject: [PATCH 019/168] Update module github.com/shirou/gopsutil/v3 to v3.24.5 (#10301) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/shirou/gopsutil/v3](https://togithub.com/shirou/gopsutil) | `v3.24.4` -> `v3.24.5` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fshirou%2fgopsutil%2fv3/v3.24.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fshirou%2fgopsutil%2fv3/v3.24.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fshirou%2fgopsutil%2fv3/v3.24.4/v3.24.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fshirou%2fgopsutil%2fv3/v3.24.4/v3.24.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
shirou/gopsutil (github.com/shirou/gopsutil/v3) ### [`v3.24.5`](https://togithub.com/shirou/gopsutil/releases/tag/v3.24.5) [Compare Source](https://togithub.com/shirou/gopsutil/compare/v3.24.4...v3.24.5) #### What's Changed ##### cpu - Improve AIX Support by [@​Dylan-M](https://togithub.com/Dylan-M) in [https://github.com/shirou/gopsutil/pull/1651](https://togithub.com/shirou/gopsutil/pull/1651) ##### process - Add fallback for lsof output by [@​MDrakos](https://togithub.com/MDrakos) in [https://github.com/shirou/gopsutil/pull/1640](https://togithub.com/shirou/gopsutil/pull/1640) - \[process]\[openbsd]: add cwd on openbsd. by [@​shirou](https://togithub.com/shirou) in [https://github.com/shirou/gopsutil/pull/1649](https://togithub.com/shirou/gopsutil/pull/1649) ##### Other Changes - remove duplicate code in mktypes.sh by [@​zhanluxianshen](https://togithub.com/zhanluxianshen) in [https://github.com/shirou/gopsutil/pull/1646](https://togithub.com/shirou/gopsutil/pull/1646) - add arm/arm64 category for github pr label. by [@​zhanluxianshen](https://togithub.com/zhanluxianshen) in [https://github.com/shirou/gopsutil/pull/1647](https://togithub.com/shirou/gopsutil/pull/1647) #### New Contributors - [@​zhanluxianshen](https://togithub.com/zhanluxianshen) made their first contribution in [https://github.com/shirou/gopsutil/pull/1646](https://togithub.com/shirou/gopsutil/pull/1646) - [@​MDrakos](https://togithub.com/MDrakos) made their first contribution in [https://github.com/shirou/gopsutil/pull/1640](https://togithub.com/shirou/gopsutil/pull/1640) - [@​Dylan-M](https://togithub.com/Dylan-M) made their first contribution in [https://github.com/shirou/gopsutil/pull/1651](https://togithub.com/shirou/gopsutil/pull/1651) **Full Changelog**: https://github.com/shirou/gopsutil/compare/v3.24.4...v3.24.5
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 8 ++------ extension/ballastextension/go.mod | 2 +- extension/ballastextension/go.sum | 17 ++--------------- extension/memorylimiterextension/go.mod | 2 +- extension/memorylimiterextension/go.sum | 17 ++--------------- go.mod | 2 +- go.sum | 15 ++------------- otelcol/go.mod | 2 +- otelcol/go.sum | 8 ++------ processor/memorylimiterprocessor/go.mod | 2 +- processor/memorylimiterprocessor/go.sum | 15 ++------------- service/go.mod | 2 +- service/go.sum | 8 ++------ 14 files changed, 21 insertions(+), 81 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 2a80c78c762..d5c72d6bfc2 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -71,7 +71,7 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.4 // indirect + github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 8860b535ede..a4209a284d1 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -55,7 +55,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -115,8 +114,8 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= -github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= +github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= +github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -128,12 +127,10 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= @@ -228,7 +225,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index b9245eba80c..74a2d79a45b 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -35,7 +35,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.4 // indirect + github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index 6a8860d5e18..561e60dbea4 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -2,7 +2,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -17,7 +16,6 @@ github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDs github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -54,17 +52,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= -github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= -github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= -github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= +github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= @@ -114,7 +103,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -138,6 +126,5 @@ google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 1a40d48a0cb..fbe37ffebfc 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -34,7 +34,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.4 // indirect + github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index 6a8860d5e18..561e60dbea4 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -2,7 +2,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -17,7 +16,6 @@ github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDs github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -54,17 +52,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= -github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= -github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= -github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= +github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= @@ -114,7 +103,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -138,6 +126,5 @@ google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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/go.mod b/go.mod index 1344c07b81f..8297a81cdec 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector go 1.21.0 require ( - github.com/shirou/gopsutil/v3 v3.24.4 + github.com/shirou/gopsutil/v3 v3.24.5 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.102.0 go.opentelemetry.io/collector/confmap v0.102.0 diff --git a/go.sum b/go.sum index 36fc51333b1..060e6a0293f 100644 --- a/go.sum +++ b/go.sum @@ -19,7 +19,6 @@ github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDs github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -66,18 +65,10 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= -github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= -github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= -github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= +github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= @@ -145,7 +136,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -171,6 +161,5 @@ google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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/otelcol/go.mod b/otelcol/go.mod index fc78e45841d..f514b58dd45 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -60,7 +60,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.4 // indirect + github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index 6c51ffbcc4d..b56225e8827 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -49,7 +49,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -103,8 +102,8 @@ github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4V github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= -github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= +github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= +github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -116,12 +115,10 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= @@ -212,7 +209,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 953712bd469..a20cccd13a0 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -38,7 +38,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.4 // indirect + github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 025936b8d10..721c7422dea 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -17,7 +17,6 @@ github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDs github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -62,18 +61,10 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= -github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= -github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= -github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= +github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= @@ -123,7 +114,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -147,6 +137,5 @@ google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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/service/go.mod b/service/go.mod index a751d607f96..fe4d1caa41f 100644 --- a/service/go.mod +++ b/service/go.mod @@ -7,7 +7,7 @@ require ( github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.54.0 - github.com/shirou/gopsutil/v3 v3.24.4 + github.com/shirou/gopsutil/v3 v3.24.5 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.102.0 diff --git a/service/go.sum b/service/go.sum index 1553789a234..f42fac86b63 100644 --- a/service/go.sum +++ b/service/go.sum @@ -48,7 +48,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -99,8 +98,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= -github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= +github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= +github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -108,12 +107,10 @@ github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnj github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= @@ -204,7 +201,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 6115ef3498b8b234e01bb897096c53794d439228 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 08:24:35 -0700 Subject: [PATCH 020/168] Update All go.opentelemetry.io/collector packages to v0.102.0 (#10304) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [go.opentelemetry.io/collector/exporter/otlpexporter](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.101.0` -> `v0.102.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.101.0/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.101.0/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/exporter/otlphttpexporter](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.101.0` -> `v0.102.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.101.0/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.101.0/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/receiver/otlpreceiver](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.101.0` -> `v0.102.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.101.0/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.101.0/v0.102.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
open-telemetry/opentelemetry-collector (go.opentelemetry.io/collector/exporter/otlpexporter) ### [`v0.102.0`](https://togithub.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v190v01020) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector/compare/v0.101.0...v0.102.0) ##### 🛑 Breaking changes 🛑 - `envprovider`: Restricts Environment Variable names. Environment variable names must now be ASCII only and start with a letter or an underscore, and can only contain underscores, letters, or numbers. ([#​9531](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9531)) - `confighttp`: Apply MaxRequestBodySize to the result of a decompressed body ([#​10289](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10289)) When using compressed payloads, the Collector would verify only the size of the compressed payload. This change applies the same restriction to the decompressed content. As a security measure, a limit of 20 MiB was added, which makes this a breaking change. For most clients, this shouldn't be a problem, but if you often have payloads that decompress to more than 20 MiB, you might want to either configure your client to send smaller batches (recommended), or increase the limit using the MaxRequestBodySize option. ##### 💡 Enhancements 💡 - `mdatagen`: auto-generate utilities to test component telemetry ([#​19783](https://togithub.com/open-telemetry/opentelemetry-collector/issues/19783)) - `mdatagen`: support setting an AttributeSet for async instruments ([#​9674](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9674)) - `mdatagen`: support using telemetry level in telemetry builder ([#​10234](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10234)) This allows components to set the minimum level needed for them to produce telemetry. By default, this is set to configtelemetry.LevelBasic. If the telemetry level is below that minimum level, then the noop meter is used for metrics. - `mdatagen`: add support for bucket boundaries for histograms ([#​10218](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10218)) - `releases`: add documentation in how to verify the image signatures using cosign ([#​9610](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9610)) ##### 🧰 Bug fixes 🧰 - `batchprocessor`: ensure attributes are set on cardinality metadata metric ([#​9674](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9674)) - `batchprocessor`: Fixing processor_batch_metadata_cardinality which was broken in v0.101.0 ([#​10231](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10231)) - `batchprocessor`: respect telemetry level for all metrics ([#​10234](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10234)) - `exporterhelper`: Fix potential deadlocks in BatcherSender shutdown ([#​10255](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10255))
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- internal/e2e/go.mod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index a5ed312b3a4..2b011a72333 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -12,12 +12,12 @@ require ( go.opentelemetry.io/collector/config/configtls v0.102.0 go.opentelemetry.io/collector/consumer v0.102.0 go.opentelemetry.io/collector/exporter v0.102.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.101.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.102.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.0 go.opentelemetry.io/collector/pdata v1.9.0 go.opentelemetry.io/collector/pdata/testdata v0.102.0 go.opentelemetry.io/collector/receiver v0.102.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 go.uber.org/goleak v1.3.0 ) From df3f826653d3f69f835bc1e440e7849d579e9ecb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 09:07:05 -0700 Subject: [PATCH 021/168] Update github/codeql-action action to v3.25.8 (#10308) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github/codeql-action](https://togithub.com/github/codeql-action) | action | patch | `v3.25.7` -> `v3.25.8` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
github/codeql-action (github/codeql-action) ### [`v3.25.8`](https://togithub.com/github/codeql-action/compare/v3.25.7...v3.25.8) [Compare Source](https://togithub.com/github/codeql-action/compare/v3.25.7...v3.25.8)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecard.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f162ccc024d..59a27b39677 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,12 +30,12 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 + uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 with: languages: go - name: Autobuild - uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 + uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 + uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 78a7ffb9ec8..cec755c6e73 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -64,6 +64,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 + uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 with: sarif_file: results.sarif From cc72c2dce06d9489755c1b01e2ed2bcc08209518 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Tue, 4 Jun 2024 09:45:37 -0700 Subject: [PATCH 022/168] [exporterhelper] Fix batch sender ignoring next senders in the chain (#10287) This change fixes a bug when the retry and timeout logic was not applied with enabled batching. The batch sender was ignoring the next senders in the chain. Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/10166 --- .chloggen/fix_batch_sender_chaining.yaml | 20 +++++++++ exporter/exporterhelper/batch_sender.go | 4 +- exporter/exporterhelper/batch_sender_test.go | 43 ++++++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 .chloggen/fix_batch_sender_chaining.yaml diff --git a/.chloggen/fix_batch_sender_chaining.yaml b/.chloggen/fix_batch_sender_chaining.yaml new file mode 100644 index 00000000000..55dece860fc --- /dev/null +++ b/.chloggen/fix_batch_sender_chaining.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix a bug when the retry and timeout logic was not applied with enabled batching. + +# One or more tracking issues or pull requests related to the change +issues: [10166] + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/exporterhelper/batch_sender.go b/exporter/exporterhelper/batch_sender.go index 086c9724aa3..a22d78a6610 100644 --- a/exporter/exporterhelper/batch_sender.go +++ b/exporter/exporterhelper/batch_sender.go @@ -119,7 +119,7 @@ func newEmptyBatch() *batch { // Caller must hold the lock. func (bs *batchSender) exportActiveBatch() { go func(b *batch) { - b.err = b.request.Export(b.ctx) + b.err = bs.nextSender.send(b.ctx, b.request) close(b.done) }(bs.activeBatch) bs.activeBatch = newEmptyBatch() @@ -182,7 +182,7 @@ func (bs *batchSender) sendMergeSplitBatch(ctx context.Context, req Request) err // Intentionally do not put the last request in the active batch to not block it. // TODO: Consider including the partial request in the error to avoid double publishing. for _, r := range reqs { - if err := r.Export(ctx); err != nil { + if err := bs.nextSender.send(ctx, r); err != nil { return err } } diff --git a/exporter/exporterhelper/batch_sender_test.go b/exporter/exporterhelper/batch_sender_test.go index bc59c0d63c5..c05f0dd54da 100644 --- a/exporter/exporterhelper/batch_sender_test.go +++ b/exporter/exporterhelper/batch_sender_test.go @@ -483,6 +483,49 @@ func TestBatchSender_ShutdownDeadlock(t *testing.T) { assert.EqualValues(t, 8, sink.itemsCount.Load()) } +func TestBatchSenderWithTimeout(t *testing.T) { + bCfg := exporterbatcher.NewDefaultConfig() + bCfg.MinSizeItems = 10 + tCfg := NewDefaultTimeoutSettings() + tCfg.Timeout = 50 * time.Microsecond + be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, + WithBatcher(bCfg, WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc)), + WithTimeout(tCfg)) + require.NoError(t, err) + require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost())) + + sink := newFakeRequestSink() + + // Send 3 concurrent requests that should be merged in two batched + wg := sync.WaitGroup{} + for i := 0; i < 3; i++ { + wg.Add(1) + go func() { + require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) + wg.Done() + }() + } + wg.Wait() + assert.EqualValues(t, 1, sink.requestsCount.Load()) + assert.EqualValues(t, 12, sink.itemsCount.Load()) + + // 3 requests with a 90ms cumulative delay must be cancelled by the timeout sender + for i := 0; i < 3; i++ { + wg.Add(1) + go func() { + assert.Error(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink, delay: 30 * time.Millisecond})) + wg.Done() + }() + } + wg.Wait() + + assert.NoError(t, be.Shutdown(context.Background())) + + // The sink should not change + assert.EqualValues(t, 1, sink.requestsCount.Load()) + assert.EqualValues(t, 12, sink.itemsCount.Load()) +} + func queueBatchExporter(t *testing.T, batchOption Option) *baseExporter { be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, batchOption, WithRequestQueue(exporterqueue.NewDefaultConfig(), exporterqueue.NewMemoryQueueFactory[Request]())) From bb4955e3be7b59c18f0a97598d4baacd41b4ccf1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 10:05:11 -0700 Subject: [PATCH 023/168] Update module golang.org/x/text to v0.16.0 (#10309) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | golang.org/x/text | `v0.15.0` -> `v0.16.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2ftext/v0.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2ftext/v0.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2ftext/v0.15.0/v0.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2ftext/v0.15.0/v0.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/mdatagen/go.mod | 2 +- cmd/mdatagen/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index eaa05254d91..c287aa3da03 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -20,7 +20,7 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - golang.org/x/text v0.15.0 + golang.org/x/text v0.16.0 ) require ( diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index ace4d10d26a..4a4d76787c8 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -99,8 +99,8 @@ golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= From 9576591eaf4ea11010f76157727d095361436e15 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Tue, 4 Jun 2024 12:53:11 -0700 Subject: [PATCH 024/168] [chore] [exporterhelper] Minor corrections for a unit test (#10312) --- exporter/exporterhelper/batch_sender_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporter/exporterhelper/batch_sender_test.go b/exporter/exporterhelper/batch_sender_test.go index c05f0dd54da..85707ce7d6e 100644 --- a/exporter/exporterhelper/batch_sender_test.go +++ b/exporter/exporterhelper/batch_sender_test.go @@ -487,7 +487,7 @@ func TestBatchSenderWithTimeout(t *testing.T) { bCfg := exporterbatcher.NewDefaultConfig() bCfg.MinSizeItems = 10 tCfg := NewDefaultTimeoutSettings() - tCfg.Timeout = 50 * time.Microsecond + tCfg.Timeout = 50 * time.Millisecond be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, WithBatcher(bCfg, WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc)), WithTimeout(tCfg)) @@ -496,7 +496,7 @@ func TestBatchSenderWithTimeout(t *testing.T) { sink := newFakeRequestSink() - // Send 3 concurrent requests that should be merged in two batched + // Send 3 concurrent requests that should be merged in one batch wg := sync.WaitGroup{} for i := 0; i < 3; i++ { wg.Add(1) From 115bc8e28e009ca93565dc4deb4cf6608fa63622 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Tue, 4 Jun 2024 20:56:08 +0100 Subject: [PATCH 025/168] [exporterhelper] Fix shutdown hang on unstarted exporter (#10313) #### Description Fix a bug where shutdown hangs if batch_sender exporter is not started. The bug causes generated component tests to fail as well. #### Link to tracking issue Fixes #10306 --- .chloggen/fix_batch_sender_shutdown.yaml | 20 ++++++++++++++++++++ exporter/exporterhelper/batch_sender.go | 9 ++++++--- exporter/exporterhelper/batch_sender_test.go | 9 +++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 .chloggen/fix_batch_sender_shutdown.yaml diff --git a/.chloggen/fix_batch_sender_shutdown.yaml b/.chloggen/fix_batch_sender_shutdown.yaml new file mode 100644 index 00000000000..36d4f71cb01 --- /dev/null +++ b/.chloggen/fix_batch_sender_shutdown.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix a bug where an unstarted batch_sender exporter hangs on shutdown + +# One or more tracking issues or pull requests related to the change +issues: [10306] + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/exporterhelper/batch_sender.go b/exporter/exporterhelper/batch_sender.go index a22d78a6610..8c69c4c1f61 100644 --- a/exporter/exporterhelper/batch_sender.go +++ b/exporter/exporterhelper/batch_sender.go @@ -54,7 +54,7 @@ func newBatchSender(cfg exporterbatcher.Config, set exporter.CreateSettings, logger: set.Logger, mergeFunc: mf, mergeSplitFunc: msf, - shutdownCh: make(chan struct{}), + shutdownCh: nil, shutdownCompleteCh: make(chan struct{}), stopped: &atomic.Bool{}, resetTimerCh: make(chan struct{}), @@ -63,6 +63,7 @@ func newBatchSender(cfg exporterbatcher.Config, set exporter.CreateSettings, } func (bs *batchSender) Start(_ context.Context, _ component.Host) error { + bs.shutdownCh = make(chan struct{}) timer := time.NewTimer(bs.cfg.FlushTimeout) go func() { for { @@ -227,7 +228,9 @@ func (bs *batchSender) updateActiveBatch(ctx context.Context, req Request) { func (bs *batchSender) Shutdown(context.Context) error { bs.stopped.Store(true) - close(bs.shutdownCh) - <-bs.shutdownCompleteCh + if bs.shutdownCh != nil { + close(bs.shutdownCh) + <-bs.shutdownCompleteCh + } return nil } diff --git a/exporter/exporterhelper/batch_sender_test.go b/exporter/exporterhelper/batch_sender_test.go index 85707ce7d6e..cfcef01711c 100644 --- a/exporter/exporterhelper/batch_sender_test.go +++ b/exporter/exporterhelper/batch_sender_test.go @@ -436,6 +436,15 @@ func TestBatchSender_WithBatcherOption(t *testing.T) { } } +func TestBatchSender_UnstartedShutdown(t *testing.T) { + be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, + WithBatcher(exporterbatcher.NewDefaultConfig(), WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc))) + require.NoError(t, err) + + err = be.Shutdown(context.Background()) + require.NoError(t, err) +} + // TestBatchSender_ShutdownDeadlock tests that the exporter does not deadlock when shutting down while a batch is being // merged. func TestBatchSender_ShutdownDeadlock(t *testing.T) { From f980592320d8ff9977fa397e64f64d4b17abcf35 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 13:57:17 -0700 Subject: [PATCH 026/168] Update All golang.org/x packages (#10311) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | golang.org/x/mod | `v0.17.0` -> `v0.18.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2fmod/v0.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2fmod/v0.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2fmod/v0.17.0/v0.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2fmod/v0.17.0/v0.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | golang.org/x/sys | `v0.20.0` -> `v0.21.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2fsys/v0.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2fsys/v0.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2fsys/v0.20.0/v0.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2fsys/v0.20.0/v0.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/builder/go.mod | 2 +- cmd/builder/go.sum | 4 ++-- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- exporter/debugexporter/go.mod | 2 +- exporter/debugexporter/go.sum | 4 ++-- exporter/go.mod | 2 +- exporter/go.sum | 4 ++-- exporter/loggingexporter/go.mod | 2 +- exporter/loggingexporter/go.sum | 4 ++-- exporter/nopexporter/go.mod | 2 +- exporter/nopexporter/go.sum | 4 ++-- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- internal/e2e/go.mod | 2 +- internal/e2e/go.sum | 4 ++-- otelcol/go.mod | 2 +- otelcol/go.sum | 4 ++-- service/go.mod | 2 +- service/go.sum | 4 ++-- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod index 48fb449c113..697bad5f793 100644 --- a/cmd/builder/go.mod +++ b/cmd/builder/go.mod @@ -18,7 +18,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/mod v0.17.0 + golang.org/x/mod v0.18.0 ) require ( diff --git a/cmd/builder/go.sum b/cmd/builder/go.sum index 285fa6f1b88..113018644b5 100644 --- a/cmd/builder/go.sum +++ b/cmd/builder/go.sum @@ -52,8 +52,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index d5c72d6bfc2..45d8ae46020 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -34,7 +34,7 @@ require ( go.opentelemetry.io/collector/receiver v0.102.0 go.opentelemetry.io/collector/receiver/nopreceiver v0.102.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 - golang.org/x/sys v0.20.0 + golang.org/x/sys v0.21.0 ) require ( diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index a4209a284d1..01b51d165b1 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -225,8 +225,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 3caf9742d16..00ec05c4627 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -50,7 +50,7 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index 89c04519593..9f241ee53bb 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -97,8 +97,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= diff --git a/exporter/go.mod b/exporter/go.mod index 816380f77bf..849800bd453 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -23,7 +23,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/sys v0.20.0 + golang.org/x/sys v0.21.0 google.golang.org/grpc v1.64.0 ) diff --git a/exporter/go.sum b/exporter/go.sum index 89c04519593..9f241ee53bb 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -97,8 +97,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index ef96c03f2db..7b808b6522a 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -50,7 +50,7 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 89c04519593..9f241ee53bb 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -97,8 +97,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index d4968af039c..73393908124 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -45,7 +45,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index 89c04519593..9f241ee53bb 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -97,8 +97,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 8137e2e0452..04b4d38823f 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -78,7 +78,7 @@ require ( go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 10cff0235fc..85dbdc1c6ab 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -129,8 +129,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 639f5a3792f..5cf6582b1a1 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -77,7 +77,7 @@ require ( go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index b05c4da6339..0eace93c0cb 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -131,8 +131,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 2b011a72333..7e1460daac7 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -82,7 +82,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 900d2014b04..13693a188c1 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -135,8 +135,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= diff --git a/otelcol/go.mod b/otelcol/go.mod index f514b58dd45..afe34317865 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -25,7 +25,7 @@ require ( go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 - golang.org/x/sys v0.20.0 + golang.org/x/sys v0.21.0 google.golang.org/grpc v1.64.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/otelcol/go.sum b/otelcol/go.sum index b56225e8827..4f1e70623e3 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -209,8 +209,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= diff --git a/service/go.mod b/service/go.mod index fe4d1caa41f..7a807bf634d 100644 --- a/service/go.mod +++ b/service/go.mod @@ -80,7 +80,7 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect diff --git a/service/go.sum b/service/go.sum index f42fac86b63..f1cef311079 100644 --- a/service/go.sum +++ b/service/go.sum @@ -201,8 +201,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= From d136b6d186fbb30376f14d3b9b7ffa8b1c10dda6 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 4 Jun 2024 14:57:59 -0600 Subject: [PATCH 027/168] [cmd/builder] Allow setting DefaultScheme in builder config (#10296) #### Description Allows configuring `DefaultScheme` via the builder config. #### Link to tracking issue Related to https://github.com/open-telemetry/opentelemetry-collector/pull/10259 Related to https://github.com/open-telemetry/opentelemetry-collector/issues/10290 #### Testing Local testing and unit tests --------- Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../builder-configure-default-scheme.yaml | 25 +++++++++++++++++++ cmd/builder/README.md | 10 ++++++++ cmd/builder/internal/builder/config.go | 9 +++++++ cmd/builder/internal/builder/main_test.go | 12 +++++++++ .../internal/builder/templates/main.go.tmpl | 3 +++ cmd/builder/internal/command.go | 2 ++ cmd/builder/internal/command_test.go | 19 +++++++++----- cmd/builder/internal/config/default.yaml | 3 +++ 8 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 .chloggen/builder-configure-default-scheme.yaml diff --git a/.chloggen/builder-configure-default-scheme.yaml b/.chloggen/builder-configure-default-scheme.yaml new file mode 100644 index 00000000000..283d8f8290b --- /dev/null +++ b/.chloggen/builder-configure-default-scheme.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: cmd/builder + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Allow setting `otelcol.CollectorSettings.ResolverSettings.DefaultScheme` via the builder's `conf_resolver.default_uri_scheme` configuration option + +# One or more tracking issues or pull requests related to the change +issues: [10296] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/builder/README.md b/cmd/builder/README.md index 57fd3c4f104..ec8d18c3808 100644 --- a/cmd/builder/README.md +++ b/cmd/builder/README.md @@ -131,6 +131,16 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.40.0 ``` +The builder also allows setting the scheme to use as the default URI scheme via `conf_resolver.default_uri_scheme`: + +```yaml +conf_resolver: + default_uri_scheme: "env" +``` + +This tells the builder to produce a Collector that uses the `env` scheme when expanding configuration that does not +provide a scheme, such as `${HOST}` (instead of doing `${env:HOST}`). + ## Steps The builder has 3 steps: diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 823b2d6d6a6..c3321924e80 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -43,9 +43,18 @@ type Config struct { Replaces []string `mapstructure:"replaces"` Excludes []string `mapstructure:"excludes"` + ConfResolver ConfResolver `mapstructure:"conf_resolver"` + downloadModules retry `mapstructure:"-"` } +type ConfResolver struct { + // When set, will be used to set the CollectorSettings.ConfResolver.DefaultScheme value, + // which determines how the Collector interprets URIs that have no scheme, such as ${ENV}. + // See https://pkg.go.dev/go.opentelemetry.io/collector/confmap#ResolverSettings for more details. + DefaultURIScheme string `mapstructure:"default_uri_scheme"` +} + // Distribution holds the parameters for the final binary type Distribution struct { Module string `mapstructure:"module"` diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 6c862c70721..fa0c0d35d24 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -316,6 +316,18 @@ func TestGenerateAndCompile(t *testing.T) { return cfg }, }, + { + testCase: "ConfResolverDefaultURIScheme set", + cfgBuilder: func(t *testing.T) Config { + cfg := newTestConfig() + cfg.ConfResolver = ConfResolver{ + DefaultURIScheme: "env", + } + cfg.Distribution.OutputPath = t.TempDir() + cfg.Replaces = append(cfg.Replaces, replaces...) + return cfg + }, + }, } for _, tt := range testCases { diff --git a/cmd/builder/internal/builder/templates/main.go.tmpl b/cmd/builder/internal/builder/templates/main.go.tmpl index f9964c5d5ec..a1bb7b532dc 100644 --- a/cmd/builder/internal/builder/templates/main.go.tmpl +++ b/cmd/builder/internal/builder/templates/main.go.tmpl @@ -35,6 +35,9 @@ func main() { {{.Name}}.NewFactory(), {{- end}} }, + {{- if .ConfResolver.DefaultURIScheme }} + DefaultScheme: "{{ .ConfResolver.DefaultURIScheme }}", + {{- end }} ConverterFactories: []confmap.ConverterFactory{ expandconverter.NewFactory(), }, diff --git a/cmd/builder/internal/command.go b/cmd/builder/internal/command.go index b6cc41a9ba5..eefc7f965d3 100644 --- a/cmd/builder/internal/command.go +++ b/cmd/builder/internal/command.go @@ -174,6 +174,8 @@ func applyCfgFromFile(flags *flag.FlagSet, cfgFromFile builder.Config) { cfg.Replaces = cfgFromFile.Replaces cfg.Excludes = cfgFromFile.Excludes + cfg.ConfResolver.DefaultURIScheme = cfgFromFile.ConfResolver.DefaultURIScheme + if !flags.Changed(skipGenerateFlag) && cfgFromFile.SkipGenerate { cfg.SkipGenerate = cfgFromFile.SkipGenerate } diff --git a/cmd/builder/internal/command_test.go b/cmd/builder/internal/command_test.go index 27ae655893b..d071efb312d 100644 --- a/cmd/builder/internal/command_test.go +++ b/cmd/builder/internal/command_test.go @@ -84,7 +84,7 @@ func Test_applyCfgFromFile(t *testing.T) { wantErr bool }{ { - name: "distribution, excludes, exporters, receivers, processors, replaces are applied correctly", + name: "distribution, scheme, excludes, exporters, receivers, processors, replaces are applied correctly", args: args{ flags: flag.NewFlagSet("version=1.0.0", 1), cfgFromFile: builder.Config{ @@ -95,16 +95,22 @@ func Test_applyCfgFromFile(t *testing.T) { Receivers: []builder.Module{testModule}, Exporters: []builder.Module{testModule}, Replaces: testStringTable, + ConfResolver: builder.ConfResolver{ + DefaultURIScheme: "env", + }, }, }, want: builder.Config{ Logger: zap.NewNop(), Distribution: testDistribution, - Excludes: testStringTable, - Processors: []builder.Module{testModule}, - Receivers: []builder.Module{testModule}, - Exporters: []builder.Module{testModule}, - Replaces: testStringTable, + ConfResolver: builder.ConfResolver{ + DefaultURIScheme: "env", + }, + Excludes: testStringTable, + Processors: []builder.Module{testModule}, + Receivers: []builder.Module{testModule}, + Exporters: []builder.Module{testModule}, + Replaces: testStringTable, }, wantErr: false, }, @@ -246,6 +252,7 @@ func Test_applyCfgFromFile(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { applyCfgFromFile(tt.args.flags, tt.args.cfgFromFile) + assert.Equal(t, tt.want.ConfResolver.DefaultURIScheme, cfg.ConfResolver.DefaultURIScheme) assert.Equal(t, tt.want.Distribution, cfg.Distribution) assert.Equal(t, tt.want.SkipGenerate, cfg.SkipGenerate) assert.Equal(t, tt.want.SkipCompilation, cfg.SkipCompilation) diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index ef856ea9137..fd316113b76 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -5,6 +5,9 @@ dist: version: 0.102.0-dev otelcol_version: 0.102.0 +conf_resolver: + default_uri_scheme: "env" + receivers: - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.0 - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 From 7b0c38e60912451dd37972a546c303d22a1ece7a Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 4 Jun 2024 14:54:41 -0700 Subject: [PATCH 028/168] [mdatagen] make meter a struct member of telemetryBuilder (#10314) This will be used in a follow up PR that allows initialization of optional internal metrics which address the queue metric use-case. Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../internal/metadata/generated_telemetry.go | 16 +++++------ cmd/mdatagen/templates/telemetry.go.tmpl | 12 ++++---- .../internal/metadata/generated_telemetry.go | 28 +++++++++---------- .../internal/metadata/generated_telemetry.go | 20 ++++++------- .../internal/metadata/generated_telemetry.go | 28 +++++++++---------- .../internal/metadata/generated_telemetry.go | 22 +++++++-------- .../internal/metadata/generated_telemetry.go | 14 ++++------ 7 files changed, 63 insertions(+), 77 deletions(-) diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go index e6530a97a9a..8b34cf0c164 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go @@ -26,6 +26,7 @@ func Tracer(settings component.TelemetrySettings) trace.Tracer { // TelemetryBuilder provides an interface for components to report telemetry // as defined in metadata and user config. type TelemetryBuilder struct { + meter metric.Meter BatchSizeTriggerSend metric.Int64Counter ProcessRuntimeTotalAllocBytes metric.Int64ObservableCounter observeProcessRuntimeTotalAllocBytes func() int64 @@ -65,22 +66,19 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme for _, op := range options { op(&builder) } - var ( - err, errs error - meter metric.Meter - ) + var err, errs error if builder.level >= configtelemetry.LevelBasic { - meter = Meter(settings) + builder.meter = Meter(settings) } else { - meter = noop.Meter{} + builder.meter = noop.Meter{} } - builder.BatchSizeTriggerSend, err = meter.Int64Counter( + builder.BatchSizeTriggerSend, err = builder.meter.Int64Counter( "batch_size_trigger_send", metric.WithDescription("Number of times the batch was sent due to a size trigger"), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessRuntimeTotalAllocBytes, err = meter.Int64ObservableCounter( + builder.ProcessRuntimeTotalAllocBytes, err = builder.meter.Int64ObservableCounter( "process_runtime_total_alloc_bytes", metric.WithDescription("Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')"), metric.WithUnit("By"), @@ -90,7 +88,7 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme }), ) errs = errors.Join(errs, err) - builder.RequestDuration, err = meter.Float64Histogram( + builder.RequestDuration, err = builder.meter.Float64Histogram( "request_duration", metric.WithDescription("Duration of request"), metric.WithUnit("s"), metric.WithExplicitBucketBoundaries([]float64{1, 10, 100}...), diff --git a/cmd/mdatagen/templates/telemetry.go.tmpl b/cmd/mdatagen/templates/telemetry.go.tmpl index fc976c91b0a..21ed853be04 100644 --- a/cmd/mdatagen/templates/telemetry.go.tmpl +++ b/cmd/mdatagen/templates/telemetry.go.tmpl @@ -29,6 +29,7 @@ func Tracer(settings component.TelemetrySettings) trace.Tracer { // TelemetryBuilder provides an interface for components to report telemetry // as defined in metadata and user config. type TelemetryBuilder struct { + meter metric.Meter {{- range $name, $metric := .Telemetry.Metrics }} {{ $name.Render }} metric.{{ $metric.Data.Instrument }} {{- if $metric.Data.Async }} @@ -77,18 +78,15 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme for _, op := range options { op(&builder) } - var ( - err, errs error - meter metric.Meter - ) + var err, errs error if builder.level >= configtelemetry.Level{{ casesTitle .Telemetry.Level.String }} { - meter = Meter(settings) + builder.meter = Meter(settings) } else { - meter = noop.Meter{} + builder.meter = noop.Meter{} } {{- range $name, $metric := .Telemetry.Metrics }} - builder.{{ $name.Render }}, err = meter.{{ $metric.Data.Instrument }}( + builder.{{ $name.Render }}, err = builder.meter.{{ $metric.Data.Instrument }}( "{{ $name }}", metric.WithDescription("{{ $metric.Description }}"), metric.WithUnit("{{ $metric.Unit }}"), diff --git a/exporter/exporterhelper/internal/metadata/generated_telemetry.go b/exporter/exporterhelper/internal/metadata/generated_telemetry.go index 481cc2b27ec..076b84bf9a8 100644 --- a/exporter/exporterhelper/internal/metadata/generated_telemetry.go +++ b/exporter/exporterhelper/internal/metadata/generated_telemetry.go @@ -24,6 +24,7 @@ func Tracer(settings component.TelemetrySettings) trace.Tracer { // TelemetryBuilder provides an interface for components to report telemetry // as defined in metadata and user config. type TelemetryBuilder struct { + meter metric.Meter ExporterEnqueueFailedLogRecords metric.Int64Counter ExporterEnqueueFailedMetricPoints metric.Int64Counter ExporterEnqueueFailedSpans metric.Int64Counter @@ -53,64 +54,61 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme for _, op := range options { op(&builder) } - var ( - err, errs error - meter metric.Meter - ) + var err, errs error if builder.level >= configtelemetry.LevelBasic { - meter = Meter(settings) + builder.meter = Meter(settings) } else { - meter = noop.Meter{} + builder.meter = noop.Meter{} } - builder.ExporterEnqueueFailedLogRecords, err = meter.Int64Counter( + builder.ExporterEnqueueFailedLogRecords, err = builder.meter.Int64Counter( "exporter_enqueue_failed_log_records", metric.WithDescription("Number of log records failed to be added to the sending queue."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ExporterEnqueueFailedMetricPoints, err = meter.Int64Counter( + builder.ExporterEnqueueFailedMetricPoints, err = builder.meter.Int64Counter( "exporter_enqueue_failed_metric_points", metric.WithDescription("Number of metric points failed to be added to the sending queue."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ExporterEnqueueFailedSpans, err = meter.Int64Counter( + builder.ExporterEnqueueFailedSpans, err = builder.meter.Int64Counter( "exporter_enqueue_failed_spans", metric.WithDescription("Number of spans failed to be added to the sending queue."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ExporterSendFailedLogRecords, err = meter.Int64Counter( + builder.ExporterSendFailedLogRecords, err = builder.meter.Int64Counter( "exporter_send_failed_log_records", metric.WithDescription("Number of log records in failed attempts to send to destination."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ExporterSendFailedMetricPoints, err = meter.Int64Counter( + builder.ExporterSendFailedMetricPoints, err = builder.meter.Int64Counter( "exporter_send_failed_metric_points", metric.WithDescription("Number of metric points in failed attempts to send to destination."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ExporterSendFailedSpans, err = meter.Int64Counter( + builder.ExporterSendFailedSpans, err = builder.meter.Int64Counter( "exporter_send_failed_spans", metric.WithDescription("Number of spans in failed attempts to send to destination."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ExporterSentLogRecords, err = meter.Int64Counter( + builder.ExporterSentLogRecords, err = builder.meter.Int64Counter( "exporter_sent_log_records", metric.WithDescription("Number of log record successfully sent to destination."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ExporterSentMetricPoints, err = meter.Int64Counter( + builder.ExporterSentMetricPoints, err = builder.meter.Int64Counter( "exporter_sent_metric_points", metric.WithDescription("Number of metric points successfully sent to destination."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ExporterSentSpans, err = meter.Int64Counter( + builder.ExporterSentSpans, err = builder.meter.Int64Counter( "exporter_sent_spans", metric.WithDescription("Number of spans successfully sent to destination."), metric.WithUnit("1"), diff --git a/processor/batchprocessor/internal/metadata/generated_telemetry.go b/processor/batchprocessor/internal/metadata/generated_telemetry.go index 76356cdc162..d94151a61d2 100644 --- a/processor/batchprocessor/internal/metadata/generated_telemetry.go +++ b/processor/batchprocessor/internal/metadata/generated_telemetry.go @@ -26,6 +26,7 @@ func Tracer(settings component.TelemetrySettings) trace.Tracer { // TelemetryBuilder provides an interface for components to report telemetry // as defined in metadata and user config. type TelemetryBuilder struct { + meter metric.Meter ProcessorBatchBatchSendSize metric.Int64Histogram ProcessorBatchBatchSendSizeBytes metric.Int64Histogram ProcessorBatchBatchSizeTriggerSend metric.Int64Counter @@ -67,34 +68,31 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme for _, op := range options { op(&builder) } - var ( - err, errs error - meter metric.Meter - ) + var err, errs error if builder.level >= configtelemetry.LevelNormal { - meter = Meter(settings) + builder.meter = Meter(settings) } else { - meter = noop.Meter{} + builder.meter = noop.Meter{} } - builder.ProcessorBatchBatchSendSize, err = meter.Int64Histogram( + builder.ProcessorBatchBatchSendSize, err = builder.meter.Int64Histogram( "processor_batch_batch_send_size", metric.WithDescription("Number of units in the batch"), metric.WithUnit("1"), metric.WithExplicitBucketBoundaries([]float64{10, 25, 50, 75, 100, 250, 500, 750, 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 20000, 30000, 50000, 100000}...), ) errs = errors.Join(errs, err) - builder.ProcessorBatchBatchSendSizeBytes, err = meter.Int64Histogram( + builder.ProcessorBatchBatchSendSizeBytes, err = builder.meter.Int64Histogram( "processor_batch_batch_send_size_bytes", metric.WithDescription("Number of bytes in batch that was sent"), metric.WithUnit("By"), metric.WithExplicitBucketBoundaries([]float64{10, 25, 50, 75, 100, 250, 500, 750, 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 20000, 30000, 50000, 100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1e+06, 2e+06, 3e+06, 4e+06, 5e+06, 6e+06, 7e+06, 8e+06, 9e+06}...), ) errs = errors.Join(errs, err) - builder.ProcessorBatchBatchSizeTriggerSend, err = meter.Int64Counter( + builder.ProcessorBatchBatchSizeTriggerSend, err = builder.meter.Int64Counter( "processor_batch_batch_size_trigger_send", metric.WithDescription("Number of times the batch was sent due to a size trigger"), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessorBatchMetadataCardinality, err = meter.Int64ObservableUpDownCounter( + builder.ProcessorBatchMetadataCardinality, err = builder.meter.Int64ObservableUpDownCounter( "processor_batch_metadata_cardinality", metric.WithDescription("Number of distinct metadata value combinations being processed"), metric.WithUnit("1"), @@ -104,7 +102,7 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme }), ) errs = errors.Join(errs, err) - builder.ProcessorBatchTimeoutTriggerSend, err = meter.Int64Counter( + builder.ProcessorBatchTimeoutTriggerSend, err = builder.meter.Int64Counter( "processor_batch_timeout_trigger_send", metric.WithDescription("Number of times the batch was sent due to a timeout trigger"), metric.WithUnit("1"), diff --git a/processor/processorhelper/internal/metadata/generated_telemetry.go b/processor/processorhelper/internal/metadata/generated_telemetry.go index 568b689edd5..94d738f4a63 100644 --- a/processor/processorhelper/internal/metadata/generated_telemetry.go +++ b/processor/processorhelper/internal/metadata/generated_telemetry.go @@ -24,6 +24,7 @@ func Tracer(settings component.TelemetrySettings) trace.Tracer { // TelemetryBuilder provides an interface for components to report telemetry // as defined in metadata and user config. type TelemetryBuilder struct { + meter metric.Meter ProcessorAcceptedLogRecords metric.Int64Counter ProcessorAcceptedMetricPoints metric.Int64Counter ProcessorAcceptedSpans metric.Int64Counter @@ -53,64 +54,61 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme for _, op := range options { op(&builder) } - var ( - err, errs error - meter metric.Meter - ) + var err, errs error if builder.level >= configtelemetry.LevelBasic { - meter = Meter(settings) + builder.meter = Meter(settings) } else { - meter = noop.Meter{} + builder.meter = noop.Meter{} } - builder.ProcessorAcceptedLogRecords, err = meter.Int64Counter( + builder.ProcessorAcceptedLogRecords, err = builder.meter.Int64Counter( "processor_accepted_log_records", metric.WithDescription("Number of log records successfully pushed into the next component in the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessorAcceptedMetricPoints, err = meter.Int64Counter( + builder.ProcessorAcceptedMetricPoints, err = builder.meter.Int64Counter( "processor_accepted_metric_points", metric.WithDescription("Number of metric points successfully pushed into the next component in the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessorAcceptedSpans, err = meter.Int64Counter( + builder.ProcessorAcceptedSpans, err = builder.meter.Int64Counter( "processor_accepted_spans", metric.WithDescription("Number of spans successfully pushed into the next component in the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessorDroppedLogRecords, err = meter.Int64Counter( + builder.ProcessorDroppedLogRecords, err = builder.meter.Int64Counter( "processor_dropped_log_records", metric.WithDescription("Number of log records that were dropped."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessorDroppedMetricPoints, err = meter.Int64Counter( + builder.ProcessorDroppedMetricPoints, err = builder.meter.Int64Counter( "processor_dropped_metric_points", metric.WithDescription("Number of metric points that were dropped."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessorDroppedSpans, err = meter.Int64Counter( + builder.ProcessorDroppedSpans, err = builder.meter.Int64Counter( "processor_dropped_spans", metric.WithDescription("Number of spans that were dropped."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessorRefusedLogRecords, err = meter.Int64Counter( + builder.ProcessorRefusedLogRecords, err = builder.meter.Int64Counter( "processor_refused_log_records", metric.WithDescription("Number of log records that were rejected by the next component in the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessorRefusedMetricPoints, err = meter.Int64Counter( + builder.ProcessorRefusedMetricPoints, err = builder.meter.Int64Counter( "processor_refused_metric_points", metric.WithDescription("Number of metric points that were rejected by the next component in the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ProcessorRefusedSpans, err = meter.Int64Counter( + builder.ProcessorRefusedSpans, err = builder.meter.Int64Counter( "processor_refused_spans", metric.WithDescription("Number of spans that were rejected by the next component in the pipeline."), metric.WithUnit("1"), diff --git a/receiver/receiverhelper/internal/metadata/generated_telemetry.go b/receiver/receiverhelper/internal/metadata/generated_telemetry.go index ee70b2e498f..0300e413abd 100644 --- a/receiver/receiverhelper/internal/metadata/generated_telemetry.go +++ b/receiver/receiverhelper/internal/metadata/generated_telemetry.go @@ -24,6 +24,7 @@ func Tracer(settings component.TelemetrySettings) trace.Tracer { // TelemetryBuilder provides an interface for components to report telemetry // as defined in metadata and user config. type TelemetryBuilder struct { + meter metric.Meter ReceiverAcceptedLogRecords metric.Int64Counter ReceiverAcceptedMetricPoints metric.Int64Counter ReceiverAcceptedSpans metric.Int64Counter @@ -50,46 +51,43 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme for _, op := range options { op(&builder) } - var ( - err, errs error - meter metric.Meter - ) + var err, errs error if builder.level >= configtelemetry.LevelBasic { - meter = Meter(settings) + builder.meter = Meter(settings) } else { - meter = noop.Meter{} + builder.meter = noop.Meter{} } - builder.ReceiverAcceptedLogRecords, err = meter.Int64Counter( + builder.ReceiverAcceptedLogRecords, err = builder.meter.Int64Counter( "receiver_accepted_log_records", metric.WithDescription("Number of log records successfully pushed into the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ReceiverAcceptedMetricPoints, err = meter.Int64Counter( + builder.ReceiverAcceptedMetricPoints, err = builder.meter.Int64Counter( "receiver_accepted_metric_points", metric.WithDescription("Number of metric points successfully pushed into the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ReceiverAcceptedSpans, err = meter.Int64Counter( + builder.ReceiverAcceptedSpans, err = builder.meter.Int64Counter( "receiver_accepted_spans", metric.WithDescription("Number of spans successfully pushed into the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ReceiverRefusedLogRecords, err = meter.Int64Counter( + builder.ReceiverRefusedLogRecords, err = builder.meter.Int64Counter( "receiver_refused_log_records", metric.WithDescription("Number of log records that could not be pushed into the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ReceiverRefusedMetricPoints, err = meter.Int64Counter( + builder.ReceiverRefusedMetricPoints, err = builder.meter.Int64Counter( "receiver_refused_metric_points", metric.WithDescription("Number of metric points that could not be pushed into the pipeline."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ReceiverRefusedSpans, err = meter.Int64Counter( + builder.ReceiverRefusedSpans, err = builder.meter.Int64Counter( "receiver_refused_spans", metric.WithDescription("Number of spans that could not be pushed into the pipeline."), metric.WithUnit("1"), diff --git a/receiver/scraperhelper/internal/metadata/generated_telemetry.go b/receiver/scraperhelper/internal/metadata/generated_telemetry.go index e8835809d4b..88c77973369 100644 --- a/receiver/scraperhelper/internal/metadata/generated_telemetry.go +++ b/receiver/scraperhelper/internal/metadata/generated_telemetry.go @@ -24,6 +24,7 @@ func Tracer(settings component.TelemetrySettings) trace.Tracer { // TelemetryBuilder provides an interface for components to report telemetry // as defined in metadata and user config. type TelemetryBuilder struct { + meter metric.Meter ScraperErroredMetricPoints metric.Int64Counter ScraperScrapedMetricPoints metric.Int64Counter level configtelemetry.Level @@ -46,22 +47,19 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme for _, op := range options { op(&builder) } - var ( - err, errs error - meter metric.Meter - ) + var err, errs error if builder.level >= configtelemetry.LevelBasic { - meter = Meter(settings) + builder.meter = Meter(settings) } else { - meter = noop.Meter{} + builder.meter = noop.Meter{} } - builder.ScraperErroredMetricPoints, err = meter.Int64Counter( + builder.ScraperErroredMetricPoints, err = builder.meter.Int64Counter( "scraper_errored_metric_points", metric.WithDescription("Number of metric points that were unable to be scraped."), metric.WithUnit("1"), ) errs = errors.Join(errs, err) - builder.ScraperScrapedMetricPoints, err = meter.Int64Counter( + builder.ScraperScrapedMetricPoints, err = builder.meter.Int64Counter( "scraper_scraped_metric_points", metric.WithDescription("Number of metric points successfully scraped."), metric.WithUnit("1"), From 714cf75f9b1b69b5a1d581a5ca542acd911d1fa0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 15:28:58 -0700 Subject: [PATCH 029/168] Update All golang.org/x packages (#10317) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | golang.org/x/net | `v0.25.0` -> `v0.26.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2fnet/v0.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2fnet/v0.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2fnet/v0.25.0/v0.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2fnet/v0.25.0/v0.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | golang.org/x/tools | `v0.21.1-0.20240514024235-59d9797072e7` -> `v0.22.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2ftools/v0.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2ftools/v0.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2ftools/v0.21.1-0.20240514024235-59d9797072e7/v0.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2ftools/v0.21.1-0.20240514024235-59d9797072e7/v0.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 4 ++-- cmd/otelcorecol/go.sum | 8 ++++---- config/confighttp/go.mod | 6 +++--- config/confighttp/go.sum | 12 ++++++------ exporter/otlphttpexporter/go.mod | 4 ++-- exporter/otlphttpexporter/go.sum | 8 ++++---- internal/e2e/go.mod | 4 ++-- internal/e2e/go.sum | 8 ++++---- internal/tools/go.mod | 12 ++++++------ internal/tools/go.sum | 28 ++++++++++++++-------------- receiver/otlpreceiver/go.mod | 6 +++--- receiver/otlpreceiver/go.sum | 12 ++++++------ 12 files changed, 56 insertions(+), 56 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 45d8ae46020..96e8e80baa6 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -119,8 +119,8 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 01b51d165b1..67cc3c00a33 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -209,8 +209,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -229,8 +229,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 120292bbdff..c81df32a2f8 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -20,7 +20,7 @@ require ( go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - golang.org/x/net v0.25.0 + golang.org/x/net v0.26.0 ) require ( @@ -54,8 +54,8 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.1 // indirect diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index 131fcda45d8..4f94b3ca351 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -94,20 +94,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 5cf6582b1a1..a108c059081 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -76,9 +76,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 0eace93c0cb..8d9539618fb 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -123,8 +123,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -135,8 +135,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 7e1460daac7..83bd60e7a4c 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -81,9 +81,9 @@ require ( go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 13693a188c1..7546cf7fba9 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -127,8 +127,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -139,8 +139,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 5f18668e17a..b71d7534ffc 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -15,7 +15,7 @@ require ( go.opentelemetry.io/build-tools/multimod v0.13.0 go.opentelemetry.io/build-tools/semconvgen v0.13.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 - golang.org/x/tools v0.21.1-0.20240514024235-59d9797072e7 + golang.org/x/tools v0.22.0 golang.org/x/vuln v1.1.1 ) @@ -204,13 +204,13 @@ require ( go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.23.0 // indirect + golang.org/x/crypto v0.24.0 // indirect golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/mod v0.18.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index d80123f69a8..c0fe906fe82 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -499,8 +499,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= @@ -517,8 +517,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -535,8 +535,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -571,8 +571,8 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -580,8 +580,8 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -591,8 +591,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -616,8 +616,8 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.21.1-0.20240514024235-59d9797072e7 h1:DnP3aRQn/r68glNGB8/7+3iE77jA+YZZCxpfIXx2MdA= -golang.org/x/tools v0.21.1-0.20240514024235-59d9797072e7/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/vuln v1.1.1 h1:4nYQg4OSr7uYQMtjuuYqLAEVuTjY4k/CPMYqvv5OPcI= golang.org/x/vuln v1.1.1/go.mod h1:hNgE+SKMSp2wHVUpW0Ow2ejgKpNJePdML+4YjxrVxik= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 1c948eff723..012fa5a98fc 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -79,9 +79,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 900d2014b04..7546cf7fba9 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -127,20 +127,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= From d9dc6ebae0078b901bee08988ab56b45de9f156c Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 4 Jun 2024 22:53:47 -0700 Subject: [PATCH 030/168] [chore] update go to 1.21.11/1.22.4 (#10321) Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/build-and-test-arm.yml | 2 +- .github/workflows/build-and-test.yml | 14 +++++++------- .github/workflows/tidy-dependencies.yml | 2 +- cmd/otelcorecol/go.mod | 2 +- pdata/pprofile/go.mod | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml index 1729c3ec69b..6eae718ca9a 100644 --- a/.github/workflows/build-and-test-arm.yml +++ b/.github/workflows/build-and-test-arm.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: "~1.22.3" + go-version: "~1.22.4" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 9e48709b2ad..7d238d9aaeb 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -45,7 +45,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -69,7 +69,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -94,7 +94,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -141,7 +141,7 @@ jobs: strategy: matrix: runner: [ubuntu-latest] - go-version: ["~1.22", "~1.21.10"] # 1.20 needs quotes otherwise it's interpreted as 1.2 + go-version: ["~1.22", "~1.21.11"] # 1.20 needs quotes otherwise it's interpreted as 1.2 runs-on: ${{ matrix.runner }} needs: [setup-environment] steps: @@ -201,7 +201,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -263,7 +263,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index 1cf7b52e623..fd462b79e1d 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -21,7 +21,7 @@ jobs: ref: ${{ github.head_ref }} - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 96e8e80baa6..4b1be1e780b 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -4,7 +4,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol go 1.21.0 -toolchain go1.21.10 +toolchain go1.21.11 require ( go.opentelemetry.io/collector/component v0.102.0 diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod index f3a7ba1375e..76e0d91d9ad 100644 --- a/pdata/pprofile/go.mod +++ b/pdata/pprofile/go.mod @@ -2,7 +2,7 @@ module go.opentelemetry.io/collector/pdata/pprofile go 1.21.0 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/stretchr/testify v1.9.0 From 4e354aa139ede4b880726f8db8148635d48594ef Mon Sep 17 00:00:00 2001 From: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Date: Wed, 5 Jun 2024 03:37:38 -0400 Subject: [PATCH 031/168] [confighttp] Deprecate `CustomRoundTripper` (#10310) #### Description Deprecates the `CustomRoundTripper` field on `confighttp.ClientConfig`, which is unused outside tests in Contrib and causes errors because it cannot be unmarshaled or marshaled. Additionally, having a non-configurable field on a Config struct seems non-ideal. Soft depends on https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33371 so we're not using deprecated APIs. #### Link to tracking issue Fixes #8627 #### Testing Adapted tests to how the new way of doing this will look. It's slightly less ergonomic (you can't load up all the settings then just run `ToClient`), but we have no examples of this being used by any components, so I'm reluctant to add it to the API. --- .chloggen/confighttp-customroundtripper.yaml | 25 +++++++++++ config/confighttp/confighttp.go | 5 ++- config/confighttp/confighttp_test.go | 45 ++++++-------------- 3 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 .chloggen/confighttp-customroundtripper.yaml diff --git a/.chloggen/confighttp-customroundtripper.yaml b/.chloggen/confighttp-customroundtripper.yaml new file mode 100644 index 00000000000..79076c0733d --- /dev/null +++ b/.chloggen/confighttp-customroundtripper.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confighttp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate `ClientConfig.CustomRoundTripper` + +# One or more tracking issues or pull requests related to the change +issues: [8627] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: Set the `Transport` field on the `*http.Client` object returned from `(ClientConfig).ToClient` instead. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/config/confighttp/confighttp.go b/config/confighttp/confighttp.go index f89f8c6ea0f..28e3d72cb67 100644 --- a/config/confighttp/confighttp.go +++ b/config/confighttp/confighttp.go @@ -58,7 +58,10 @@ type ClientConfig struct { Headers map[string]configopaque.String `mapstructure:"headers"` // Custom Round Tripper to allow for individual components to intercept HTTP requests - CustomRoundTripper func(next http.RoundTripper) (http.RoundTripper, error) + // + // Deprecated: [v0.103.0] Set (*http.Client).Transport on the *http.Client returned from ToClient + // to configure this. + CustomRoundTripper func(next http.RoundTripper) (http.RoundTripper, error) `mapstructure:"-"` // Auth configuration for outgoing HTTP calls. Auth *configauth.Authentication `mapstructure:"auth"` diff --git a/config/confighttp/confighttp_test.go b/config/confighttp/confighttp_test.go index 99ac9a51201..c7c45924783 100644 --- a/config/confighttp/confighttp_test.go +++ b/config/confighttp/confighttp_test.go @@ -81,7 +81,6 @@ func TestAllHTTPClientSettings(t *testing.T) { MaxIdleConnsPerHost: &maxIdleConnsPerHost, MaxConnsPerHost: &maxConnsPerHost, IdleConnTimeout: &idleConnTimeout, - CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, Compression: "", DisableKeepAlives: true, HTTP2ReadIdleTimeout: idleConnTimeout, @@ -102,7 +101,6 @@ func TestAllHTTPClientSettings(t *testing.T) { MaxIdleConnsPerHost: &maxIdleConnsPerHost, MaxConnsPerHost: &maxConnsPerHost, IdleConnTimeout: &idleConnTimeout, - CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, Compression: "none", DisableKeepAlives: true, HTTP2ReadIdleTimeout: idleConnTimeout, @@ -123,7 +121,6 @@ func TestAllHTTPClientSettings(t *testing.T) { MaxIdleConnsPerHost: &maxIdleConnsPerHost, MaxConnsPerHost: &maxConnsPerHost, IdleConnTimeout: &idleConnTimeout, - CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, Compression: "gzip", DisableKeepAlives: true, HTTP2ReadIdleTimeout: idleConnTimeout, @@ -144,7 +141,6 @@ func TestAllHTTPClientSettings(t *testing.T) { MaxIdleConnsPerHost: &maxIdleConnsPerHost, MaxConnsPerHost: &maxConnsPerHost, IdleConnTimeout: &idleConnTimeout, - CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, Compression: "gzip", DisableKeepAlives: true, HTTP2ReadIdleTimeout: idleConnTimeout, @@ -152,19 +148,6 @@ func TestAllHTTPClientSettings(t *testing.T) { }, shouldError: false, }, - { - name: "error_round_tripper_returned", - settings: ClientConfig{ - Endpoint: "localhost:1234", - TLSSetting: configtls.ClientConfig{ - Insecure: false, - }, - ReadBufferSize: 1024, - WriteBufferSize: 512, - CustomRoundTripper: func(http.RoundTripper) (http.RoundTripper, error) { return nil, errors.New("error") }, - }, - shouldError: true, - }, } for _, test := range tests { @@ -212,9 +195,8 @@ func TestPartialHTTPClientSettings(t *testing.T) { TLSSetting: configtls.ClientConfig{ Insecure: false, }, - ReadBufferSize: 1024, - WriteBufferSize: 512, - CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, + ReadBufferSize: 1024, + WriteBufferSize: 512, }, shouldError: false, }, @@ -728,15 +710,14 @@ func TestHttpReception(t *testing.T) { Endpoint: prefix + ln.Addr().String(), TLSSetting: *tt.tlsClientCreds, } + + client, errClient := hcs.ToClient(context.Background(), componenttest.NewNopHost(), component.TelemetrySettings{}) + require.NoError(t, errClient) + if tt.forceHTTP1 { expectedProto = "HTTP/1.1" - hcs.CustomRoundTripper = func(rt http.RoundTripper) (http.RoundTripper, error) { - rt.(*http.Transport).ForceAttemptHTTP2 = false - return rt, nil - } + client.Transport.(*http.Transport).ForceAttemptHTTP2 = false } - client, errClient := hcs.ToClient(context.Background(), componenttest.NewNopHost(), component.TelemetrySettings{}) - require.NoError(t, errClient) resp, errResp := client.Get(hcs.Endpoint) if tt.hasError { @@ -1479,23 +1460,23 @@ func BenchmarkHttpRequest(b *testing.B) { Endpoint: "https://" + ln.Addr().String(), TLSSetting: *tlsClientCreds, } - if bb.forceHTTP1 { - hcs.CustomRoundTripper = func(rt http.RoundTripper) (http.RoundTripper, error) { - rt.(*http.Transport).ForceAttemptHTTP2 = false - return rt, nil - } - } + b.Run(bb.name, func(b *testing.B) { var c *http.Client if !bb.clientPerThread { c, err = hcs.ToClient(context.Background(), componenttest.NewNopHost(), component.TelemetrySettings{}) require.NoError(b, err) + } b.RunParallel(func(pb *testing.PB) { if c == nil { c, err = hcs.ToClient(context.Background(), componenttest.NewNopHost(), component.TelemetrySettings{}) require.NoError(b, err) } + if bb.forceHTTP1 { + c.Transport.(*http.Transport).ForceAttemptHTTP2 = false + } + for pb.Next() { resp, errResp := c.Get(hcs.Endpoint) require.NoError(b, errResp) From 760f773df042305bd2d92e908cedc17957f6c542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Wed, 5 Jun 2024 15:40:14 +0200 Subject: [PATCH 032/168] [configgrpc] Use own compressors for zstd (#10323) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Uses our own version of the zstd compressor for gRPC servers. The code for it is based on the gzip compressor that comes built-in with gRPC. Benchmarks before this PR: ``` Running tool: /usr/bin/go test -benchmem -run=^$ -bench ^BenchmarkCompressors$ go.opentelemetry.io/collector/config/configgrpc sm_log_requestgoos: linux goarch: amd64 pkg: go.opentelemetry.io/collector/config/configgrpc cpu: 11th Gen Intel(R) Core(TM) i7-11800H @ 2.30GHz BenchmarkCompressors/sm_log_request/raw_bytes_160/compressed_bytes_162/compressor_gzip-16 71594 19066 ns/op 615 B/op 4 allocs/op sm_log_requestBenchmarkCompressors/sm_log_request/raw_bytes_160/compressed_bytes_159/compressor_zstd-16 151503 8544 ns/op 640 B/op 6 allocs/op sm_log_requestBenchmarkCompressors/sm_log_request/raw_bytes_160/compressed_bytes_178/compressor_snappy-16 3632570 303.8 ns/op 304 B/op 3 allocs/op md_log_requestBenchmarkCompressors/md_log_request/raw_bytes_242/compressed_bytes_219/compressor_gzip-16 68114 16938 ns/op 748 B/op 4 allocs/op md_log_requestBenchmarkCompressors/md_log_request/raw_bytes_242/compressed_bytes_209/compressor_zstd-16 138091 8047 ns/op 896 B/op 6 allocs/op md_log_requestBenchmarkCompressors/md_log_request/raw_bytes_242/compressed_bytes_260/compressor_snappy-16 3081198 402.5 ns/op 400 B/op 3 allocs/op lg_log_requestBenchmarkCompressors/lg_log_request/raw_bytes_4850/compressed_bytes_253/compressor_gzip-16 43414 27174 ns/op 386 B/op 3 allocs/op lg_log_requestBenchmarkCompressors/lg_log_request/raw_bytes_4850/compressed_bytes_216/compressor_zstd-16 117534 9903 ns/op 10112 B/op 6 allocs/op lg_log_requestBenchmarkCompressors/lg_log_request/raw_bytes_4850/compressed_bytes_454/compressor_snappy-16 1000000 1190 ns/op 528 B/op 2 allocs/op sm_trace_requestBenchmarkCompressors/sm_trace_request/raw_bytes_231/compressed_bytes_203/compressor_gzip-16 67275 17508 ns/op 700 B/op 4 allocs/op sm_trace_requestBenchmarkCompressors/sm_trace_request/raw_bytes_231/compressed_bytes_201/compressor_zstd-16 196862 6137 ns/op 848 B/op 6 allocs/op sm_trace_requestBenchmarkCompressors/sm_trace_request/raw_bytes_231/compressed_bytes_220/compressor_snappy-16 3595815 331.7 ns/op 272 B/op 2 allocs/op md_trace_requestBenchmarkCompressors/md_trace_request/raw_bytes_329/compressed_bytes_249/compressor_gzip-16 64105 19104 ns/op 844 B/op 4 allocs/op md_trace_requestBenchmarkCompressors/md_trace_request/raw_bytes_329/compressed_bytes_256/compressor_zstd-16 169221 6929 ns/op 1120 B/op 6 allocs/op md_trace_requestBenchmarkCompressors/md_trace_request/raw_bytes_329/compressed_bytes_279/compressor_snappy-16 2602239 473.0 ns/op 336 B/op 2 allocs/op lg_trace_requestBenchmarkCompressors/lg_trace_request/raw_bytes_7025/compressed_bytes_303/compressor_gzip-16 33861 36473 ns/op 904 B/op 4 allocs/op lg_trace_requestBenchmarkCompressors/lg_trace_request/raw_bytes_7025/compressed_bytes_258/compressor_zstd-16 107828 10596 ns/op 16832 B/op 6 allocs/op lg_trace_requestBenchmarkCompressors/lg_trace_request/raw_bytes_7025/compressed_bytes_591/compressor_snappy-16 725080 1540 ns/op 689 B/op 2 allocs/op sm_metric_requestBenchmarkCompressors/sm_metric_request/raw_bytes_183/compressed_bytes_140/compressor_gzip-16 76315 16394 ns/op 496 B/op 4 allocs/op sm_metric_requestBenchmarkCompressors/sm_metric_request/raw_bytes_183/compressed_bytes_137/compressor_zstd-16 193314 5957 ns/op 688 B/op 6 allocs/op sm_metric_requestBenchmarkCompressors/sm_metric_request/raw_bytes_183/compressed_bytes_152/compressor_snappy-16 3558649 345.2 ns/op 208 B/op 2 allocs/op md_metric_requestBenchmarkCompressors/md_metric_request/raw_bytes_376/compressed_bytes_194/compressor_gzip-16 68497 18413 ns/op 699 B/op 4 allocs/op md_metric_requestBenchmarkCompressors/md_metric_request/raw_bytes_376/compressed_bytes_198/compressor_zstd-16 177841 6520 ns/op 1136 B/op 6 allocs/op md_metric_requestBenchmarkCompressors/md_metric_request/raw_bytes_376/compressed_bytes_222/compressor_snappy-16 2354102 497.4 ns/op 272 B/op 2 allocs/op lg_metric_requestBenchmarkCompressors/lg_metric_request/raw_bytes_10991/compressed_bytes_601/compressor_gzip-16 21943 54603 ns/op 1941 B/op 5 allocs/op lg_metric_requestBenchmarkCompressors/lg_metric_request/raw_bytes_10991/compressed_bytes_559/compressor_zstd-16 71260 16077 ns/op 25312 B/op 6 allocs/op lg_metric_requestBenchmarkCompressors/lg_metric_request/raw_bytes_10991/compressed_bytes_1055/compressor_snappy-16 335415 3026 ns/op 1200 B/op 2 allocs/op PASS ok go.opentelemetry.io/collector/config/configgrpc 37.766s ``` After this version: ``` Running tool: /usr/bin/go test -benchmem -run=^$ -bench ^BenchmarkCompressors$ go.opentelemetry.io/collector/config/configgrpc sm_log_requestgoos: linux goarch: amd64 pkg: go.opentelemetry.io/collector/config/configgrpc cpu: 11th Gen Intel(R) Core(TM) i7-11800H @ 2.30GHz BenchmarkCompressors/sm_log_request/raw_bytes_160/compressed_bytes_162/compressor_gzip-16 74952 15710 ns/op 603 B/op 4 allocs/op sm_log_requestBenchmarkCompressors/sm_log_request/raw_bytes_160/compressed_bytes_159/compressor_zstd-16 156784 6966 ns/op 208 B/op 2 allocs/op sm_log_requestBenchmarkCompressors/sm_log_request/raw_bytes_160/compressed_bytes_178/compressor_snappy-16 2216174 510.4 ns/op 308 B/op 3 allocs/op md_log_requestBenchmarkCompressors/md_log_request/raw_bytes_242/compressed_bytes_219/compressor_gzip-16 68095 18569 ns/op 736 B/op 4 allocs/op md_log_requestBenchmarkCompressors/md_log_request/raw_bytes_242/compressed_bytes_209/compressor_zstd-16 150705 8849 ns/op 294 B/op 2 allocs/op md_log_requestBenchmarkCompressors/md_log_request/raw_bytes_242/compressed_bytes_260/compressor_snappy-16 2149710 556.8 ns/op 406 B/op 3 allocs/op lg_log_requestBenchmarkCompressors/lg_log_request/raw_bytes_4850/compressed_bytes_253/compressor_gzip-16 40040 26159 ns/op 368 B/op 3 allocs/op lg_log_requestBenchmarkCompressors/lg_log_request/raw_bytes_4850/compressed_bytes_216/compressor_zstd-16 123043 10254 ns/op 299 B/op 2 allocs/op lg_log_requestBenchmarkCompressors/lg_log_request/raw_bytes_4850/compressed_bytes_454/compressor_snappy-16 726780 1457 ns/op 533 B/op 2 allocs/op sm_trace_requestBenchmarkCompressors/sm_trace_request/raw_bytes_231/compressed_bytes_203/compressor_gzip-16 64660 18186 ns/op 701 B/op 4 allocs/op sm_trace_requestBenchmarkCompressors/sm_trace_request/raw_bytes_231/compressed_bytes_201/compressor_zstd-16 193225 6267 ns/op 273 B/op 2 allocs/op sm_trace_requestBenchmarkCompressors/sm_trace_request/raw_bytes_231/compressed_bytes_220/compressor_snappy-16 2925073 418.2 ns/op 276 B/op 2 allocs/op md_trace_requestBenchmarkCompressors/md_trace_request/raw_bytes_329/compressed_bytes_249/compressor_gzip-16 61320 20641 ns/op 846 B/op 4 allocs/op md_trace_requestBenchmarkCompressors/md_trace_request/raw_bytes_329/compressed_bytes_256/compressor_zstd-16 190965 6440 ns/op 321 B/op 2 allocs/op md_trace_requestBenchmarkCompressors/md_trace_request/raw_bytes_329/compressed_bytes_279/compressor_snappy-16 2051575 656.8 ns/op 341 B/op 2 allocs/op lg_trace_requestBenchmarkCompressors/lg_trace_request/raw_bytes_7025/compressed_bytes_303/compressor_gzip-16 30097 40680 ns/op 907 B/op 4 allocs/op lg_trace_requestBenchmarkCompressors/lg_trace_request/raw_bytes_7025/compressed_bytes_258/compressor_zstd-16 127027 8437 ns/op 363 B/op 2 allocs/op lg_trace_requestBenchmarkCompressors/lg_trace_request/raw_bytes_7025/compressed_bytes_591/compressor_snappy-16 716541 1803 ns/op 694 B/op 2 allocs/op sm_metric_requestBenchmarkCompressors/sm_metric_request/raw_bytes_183/compressed_bytes_140/compressor_gzip-16 82287 15054 ns/op 496 B/op 4 allocs/op sm_metric_requestBenchmarkCompressors/sm_metric_request/raw_bytes_183/compressed_bytes_137/compressor_zstd-16 230558 5470 ns/op 221 B/op 2 allocs/op sm_metric_requestBenchmarkCompressors/sm_metric_request/raw_bytes_183/compressed_bytes_152/compressor_snappy-16 2759403 417.1 ns/op 211 B/op 2 allocs/op md_metric_requestBenchmarkCompressors/md_metric_request/raw_bytes_376/compressed_bytes_194/compressor_gzip-16 58208 18925 ns/op 702 B/op 4 allocs/op md_metric_requestBenchmarkCompressors/md_metric_request/raw_bytes_376/compressed_bytes_198/compressor_zstd-16 199226 6247 ns/op 256 B/op 2 allocs/op md_metric_requestBenchmarkCompressors/md_metric_request/raw_bytes_376/compressed_bytes_222/compressor_snappy-16 2065202 609.8 ns/op 276 B/op 2 allocs/op lg_metric_requestBenchmarkCompressors/lg_metric_request/raw_bytes_10991/compressed_bytes_601/compressor_gzip-16 20583 59762 ns/op 1945 B/op 5 allocs/op lg_metric_requestBenchmarkCompressors/lg_metric_request/raw_bytes_10991/compressed_bytes_559/compressor_zstd-16 98254 13152 ns/op 728 B/op 2 allocs/op lg_metric_requestBenchmarkCompressors/lg_metric_request/raw_bytes_10991/compressed_bytes_1055/compressor_snappy-16 389401 3976 ns/op 1209 B/op 2 allocs/op PASS ok go.opentelemetry.io/collector/config/configgrpc 40.394s ``` Signed-off-by: Juraci Paixão Kröhling --------- Signed-off-by: Juraci Paixão Kröhling --- ...nfiggrpc-use-own-compressors-for-zstd.yaml | 13 +++ config/configgrpc/configgrpc.go | 4 +- .../configgrpc/configgrpc_benchmark_test.go | 4 +- config/configgrpc/go.mod | 2 +- config/configgrpc/internal/zstd.go | 83 +++++++++++++++++++ config/configgrpc/internal/zstd_test.go | 41 +++++++++ receiver/otlpreceiver/otlp_test.go | 3 +- 7 files changed, 144 insertions(+), 6 deletions(-) create mode 100644 .chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml create mode 100644 config/configgrpc/internal/zstd.go create mode 100644 config/configgrpc/internal/zstd_test.go diff --git a/.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml b/.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml new file mode 100644 index 00000000000..a04c4f89012 --- /dev/null +++ b/.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml @@ -0,0 +1,13 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'bug_fix' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: Use own compressors for zstd + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Before this change, the zstd compressor we used didn't respect the max message size. + +# One or more tracking issues or pull requests related to the change +issues: [10323] diff --git a/config/configgrpc/configgrpc.go b/config/configgrpc/configgrpc.go index 87e7b83d766..e64b87142ca 100644 --- a/config/configgrpc/configgrpc.go +++ b/config/configgrpc/configgrpc.go @@ -12,7 +12,6 @@ import ( "time" "github.com/mostynb/go-grpc-compression/nonclobbering/snappy" - "github.com/mostynb/go-grpc-compression/nonclobbering/zstd" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel" "google.golang.org/grpc" @@ -28,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/configcompression" + grpcInternal "go.opentelemetry.io/collector/config/configgrpc/internal" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtelemetry" @@ -426,7 +426,7 @@ func getGRPCCompressionName(compressionType configcompression.Type) (string, err case configcompression.TypeSnappy: return snappy.Name, nil case configcompression.TypeZstd: - return zstd.Name, nil + return grpcInternal.ZstdName, nil default: return "", fmt.Errorf("unsupported compression type %q", compressionType) } diff --git a/config/configgrpc/configgrpc_benchmark_test.go b/config/configgrpc/configgrpc_benchmark_test.go index 1ad755f2b4f..3254655e9ec 100644 --- a/config/configgrpc/configgrpc_benchmark_test.go +++ b/config/configgrpc/configgrpc_benchmark_test.go @@ -10,12 +10,12 @@ import ( "testing" "github.com/mostynb/go-grpc-compression/nonclobbering/snappy" - "github.com/mostynb/go-grpc-compression/nonclobbering/zstd" "google.golang.org/grpc/codes" "google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding/gzip" "google.golang.org/grpc/status" + "go.opentelemetry.io/collector/config/configgrpc/internal" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -27,7 +27,7 @@ func BenchmarkCompressors(b *testing.B) { compressors := make([]encoding.Compressor, 0) compressors = append(compressors, encoding.GetCompressor(gzip.Name)) - compressors = append(compressors, encoding.GetCompressor(zstd.Name)) + compressors = append(compressors, encoding.GetCompressor(internal.ZstdName)) compressors = append(compressors, encoding.GetCompressor(snappy.Name)) for _, payload := range payloads { diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index f48c225d577..992ff01e66a 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -3,6 +3,7 @@ module go.opentelemetry.io/collector/config/configgrpc go 1.21.0 require ( + github.com/klauspost/compress v1.17.2 github.com/mostynb/go-grpc-compression v1.2.2 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.102.0 @@ -36,7 +37,6 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.2 // indirect 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.1.1 // indirect diff --git a/config/configgrpc/internal/zstd.go b/config/configgrpc/internal/zstd.go new file mode 100644 index 00000000000..0718b73535f --- /dev/null +++ b/config/configgrpc/internal/zstd.go @@ -0,0 +1,83 @@ +// Copyright The OpenTelemetry Authors +// Copyright 2017 gRPC authors +// SPDX-License-Identifier: Apache-2.0 + +package internal // import "go.opentelemetry.io/collector/config/configgrpc/internal" + +import ( + "errors" + "io" + "sync" + + "github.com/klauspost/compress/zstd" + "google.golang.org/grpc/encoding" +) + +const ZstdName = "zstd" + +func init() { + encoding.RegisterCompressor(NewZstdCodec()) +} + +type writer struct { + *zstd.Encoder + pool *sync.Pool +} + +func NewZstdCodec() encoding.Compressor { + c := &compressor{} + c.poolCompressor.New = func() any { + zw, _ := zstd.NewWriter(nil, zstd.WithEncoderConcurrency(1), zstd.WithWindowSize(512*1024)) + return &writer{Encoder: zw, pool: &c.poolCompressor} + } + return c +} + +func (c *compressor) Compress(w io.Writer) (io.WriteCloser, error) { + z := c.poolCompressor.Get().(*writer) + z.Encoder.Reset(w) + return z, nil +} + +func (z *writer) Close() error { + defer z.pool.Put(z) + return z.Encoder.Close() +} + +type reader struct { + *zstd.Decoder + pool *sync.Pool +} + +func (c *compressor) Decompress(r io.Reader) (io.Reader, error) { + z, inPool := c.poolDecompressor.Get().(*reader) + if !inPool { + newZ, err := zstd.NewReader(r) + if err != nil { + return nil, err + } + return &reader{Decoder: newZ, pool: &c.poolDecompressor}, nil + } + if err := z.Reset(r); err != nil { + c.poolDecompressor.Put(z) + return nil, err + } + return z, nil +} + +func (z *reader) Read(p []byte) (n int, err error) { + n, err = z.Decoder.Read(p) + if errors.Is(err, io.EOF) { + z.pool.Put(z) + } + return n, err +} + +func (c *compressor) Name() string { + return ZstdName +} + +type compressor struct { + poolCompressor sync.Pool + poolDecompressor sync.Pool +} diff --git a/config/configgrpc/internal/zstd_test.go b/config/configgrpc/internal/zstd_test.go new file mode 100644 index 00000000000..e16336c8ccb --- /dev/null +++ b/config/configgrpc/internal/zstd_test.go @@ -0,0 +1,41 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package internal + +import ( + "bytes" + "io" + "testing" + + "github.com/stretchr/testify/require" +) + +func Test_zstdCodec_CompressDecompress(t *testing.T) { + // prepare + msg := []byte("Hello world.") + compressed := &bytes.Buffer{} + + // zstd header, for sanity checking + header := []byte{40, 181, 47, 253} + + c := NewZstdCodec() + cWriter, err := c.Compress(compressed) + require.NoError(t, err) + require.NotNil(t, cWriter) + + _, err = cWriter.Write(msg) + require.NoError(t, err) + cWriter.Close() + + cReader, err := c.Decompress(compressed) + require.NoError(t, err) + require.NotNil(t, cReader) + + uncompressed, err := io.ReadAll(cReader) + require.NoError(t, err) + require.Equal(t, msg, uncompressed) + + // test header + require.Equal(t, header, compressed.Bytes()[:4]) +} diff --git a/receiver/otlpreceiver/otlp_test.go b/receiver/otlpreceiver/otlp_test.go index 51f99bb4cb8..14eecbcdac1 100644 --- a/receiver/otlpreceiver/otlp_test.go +++ b/receiver/otlpreceiver/otlp_test.go @@ -726,7 +726,8 @@ func TestGRPCMaxRecvSize(t *testing.T) { require.NoError(t, err) td := testdata.GenerateTraces(50000) - require.Error(t, exportTraces(cc, td)) + err = exportTraces(cc, td) + require.Error(t, err) assert.NoError(t, cc.Close()) require.NoError(t, recv.Shutdown(context.Background())) From 0ab388b9bd456c3bc59c141d5869f6b4b0e8098e Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 5 Jun 2024 13:48:00 +0000 Subject: [PATCH 033/168] [chore] update go to 1.21.11/1.22.4 (#10321) (#10325) Backport of #10321 Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/build-and-test-arm.yml | 2 +- .github/workflows/build-and-test.yml | 14 +++++++------- .github/workflows/tidy-dependencies.yml | 2 +- cmd/otelcorecol/go.mod | 2 +- pdata/pprofile/go.mod | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml index 1729c3ec69b..6eae718ca9a 100644 --- a/.github/workflows/build-and-test-arm.yml +++ b/.github/workflows/build-and-test-arm.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: "~1.22.3" + go-version: "~1.22.4" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 9e48709b2ad..7d238d9aaeb 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -45,7 +45,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -69,7 +69,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -94,7 +94,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -141,7 +141,7 @@ jobs: strategy: matrix: runner: [ubuntu-latest] - go-version: ["~1.22", "~1.21.10"] # 1.20 needs quotes otherwise it's interpreted as 1.2 + go-version: ["~1.22", "~1.21.11"] # 1.20 needs quotes otherwise it's interpreted as 1.2 runs-on: ${{ matrix.runner }} needs: [setup-environment] steps: @@ -201,7 +201,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache @@ -263,7 +263,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index 1cf7b52e623..fd462b79e1d 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -21,7 +21,7 @@ jobs: ref: ${{ github.head_ref }} - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.10 + go-version: ~1.21.11 cache: false - name: Cache Go id: go-cache diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 2678acaaefc..d287217ea4d 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -4,7 +4,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol go 1.21.0 -toolchain go1.21.10 +toolchain go1.21.11 require ( go.opentelemetry.io/collector/component v0.102.0 diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod index f3a7ba1375e..76e0d91d9ad 100644 --- a/pdata/pprofile/go.mod +++ b/pdata/pprofile/go.mod @@ -2,7 +2,7 @@ module go.opentelemetry.io/collector/pdata/pprofile go 1.21.0 -toolchain go1.21.10 +toolchain go1.21.11 require ( github.com/stretchr/testify v1.9.0 From 10e89bd77ab9e09b75bd6f440c925d3293e13233 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 5 Jun 2024 13:49:59 +0000 Subject: [PATCH 034/168] [configgrpc] Use own compressors for zstd (#10323) (#10324) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport of #10323 Signed-off-by: Juraci Paixão Kröhling Co-authored-by: Juraci Paixão Kröhling --- ...nfiggrpc-use-own-compressors-for-zstd.yaml | 13 +++ config/configgrpc/configgrpc.go | 4 +- .../configgrpc/configgrpc_benchmark_test.go | 4 +- config/configgrpc/go.mod | 2 +- config/configgrpc/internal/zstd.go | 83 +++++++++++++++++++ config/configgrpc/internal/zstd_test.go | 41 +++++++++ receiver/otlpreceiver/otlp_test.go | 3 +- 7 files changed, 144 insertions(+), 6 deletions(-) create mode 100644 .chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml create mode 100644 config/configgrpc/internal/zstd.go create mode 100644 config/configgrpc/internal/zstd_test.go diff --git a/.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml b/.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml new file mode 100644 index 00000000000..a04c4f89012 --- /dev/null +++ b/.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml @@ -0,0 +1,13 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'bug_fix' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: Use own compressors for zstd + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Before this change, the zstd compressor we used didn't respect the max message size. + +# One or more tracking issues or pull requests related to the change +issues: [10323] diff --git a/config/configgrpc/configgrpc.go b/config/configgrpc/configgrpc.go index 98d428857ce..b57a199461c 100644 --- a/config/configgrpc/configgrpc.go +++ b/config/configgrpc/configgrpc.go @@ -12,7 +12,6 @@ import ( "time" "github.com/mostynb/go-grpc-compression/nonclobbering/snappy" - "github.com/mostynb/go-grpc-compression/nonclobbering/zstd" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel" "google.golang.org/grpc" @@ -28,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/configcompression" + grpcInternal "go.opentelemetry.io/collector/config/configgrpc/internal" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtelemetry" @@ -426,7 +426,7 @@ func getGRPCCompressionName(compressionType configcompression.Type) (string, err case configcompression.TypeSnappy: return snappy.Name, nil case configcompression.TypeZstd: - return zstd.Name, nil + return grpcInternal.ZstdName, nil default: return "", fmt.Errorf("unsupported compression type %q", compressionType) } diff --git a/config/configgrpc/configgrpc_benchmark_test.go b/config/configgrpc/configgrpc_benchmark_test.go index 1ad755f2b4f..3254655e9ec 100644 --- a/config/configgrpc/configgrpc_benchmark_test.go +++ b/config/configgrpc/configgrpc_benchmark_test.go @@ -10,12 +10,12 @@ import ( "testing" "github.com/mostynb/go-grpc-compression/nonclobbering/snappy" - "github.com/mostynb/go-grpc-compression/nonclobbering/zstd" "google.golang.org/grpc/codes" "google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding/gzip" "google.golang.org/grpc/status" + "go.opentelemetry.io/collector/config/configgrpc/internal" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -27,7 +27,7 @@ func BenchmarkCompressors(b *testing.B) { compressors := make([]encoding.Compressor, 0) compressors = append(compressors, encoding.GetCompressor(gzip.Name)) - compressors = append(compressors, encoding.GetCompressor(zstd.Name)) + compressors = append(compressors, encoding.GetCompressor(internal.ZstdName)) compressors = append(compressors, encoding.GetCompressor(snappy.Name)) for _, payload := range payloads { diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index cca50c4ffc5..960a0d96376 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -3,6 +3,7 @@ module go.opentelemetry.io/collector/config/configgrpc go 1.21.0 require ( + github.com/klauspost/compress v1.17.2 github.com/mostynb/go-grpc-compression v1.2.2 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.102.0 @@ -36,7 +37,6 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.2 // indirect 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.1.1 // indirect diff --git a/config/configgrpc/internal/zstd.go b/config/configgrpc/internal/zstd.go new file mode 100644 index 00000000000..0718b73535f --- /dev/null +++ b/config/configgrpc/internal/zstd.go @@ -0,0 +1,83 @@ +// Copyright The OpenTelemetry Authors +// Copyright 2017 gRPC authors +// SPDX-License-Identifier: Apache-2.0 + +package internal // import "go.opentelemetry.io/collector/config/configgrpc/internal" + +import ( + "errors" + "io" + "sync" + + "github.com/klauspost/compress/zstd" + "google.golang.org/grpc/encoding" +) + +const ZstdName = "zstd" + +func init() { + encoding.RegisterCompressor(NewZstdCodec()) +} + +type writer struct { + *zstd.Encoder + pool *sync.Pool +} + +func NewZstdCodec() encoding.Compressor { + c := &compressor{} + c.poolCompressor.New = func() any { + zw, _ := zstd.NewWriter(nil, zstd.WithEncoderConcurrency(1), zstd.WithWindowSize(512*1024)) + return &writer{Encoder: zw, pool: &c.poolCompressor} + } + return c +} + +func (c *compressor) Compress(w io.Writer) (io.WriteCloser, error) { + z := c.poolCompressor.Get().(*writer) + z.Encoder.Reset(w) + return z, nil +} + +func (z *writer) Close() error { + defer z.pool.Put(z) + return z.Encoder.Close() +} + +type reader struct { + *zstd.Decoder + pool *sync.Pool +} + +func (c *compressor) Decompress(r io.Reader) (io.Reader, error) { + z, inPool := c.poolDecompressor.Get().(*reader) + if !inPool { + newZ, err := zstd.NewReader(r) + if err != nil { + return nil, err + } + return &reader{Decoder: newZ, pool: &c.poolDecompressor}, nil + } + if err := z.Reset(r); err != nil { + c.poolDecompressor.Put(z) + return nil, err + } + return z, nil +} + +func (z *reader) Read(p []byte) (n int, err error) { + n, err = z.Decoder.Read(p) + if errors.Is(err, io.EOF) { + z.pool.Put(z) + } + return n, err +} + +func (c *compressor) Name() string { + return ZstdName +} + +type compressor struct { + poolCompressor sync.Pool + poolDecompressor sync.Pool +} diff --git a/config/configgrpc/internal/zstd_test.go b/config/configgrpc/internal/zstd_test.go new file mode 100644 index 00000000000..e16336c8ccb --- /dev/null +++ b/config/configgrpc/internal/zstd_test.go @@ -0,0 +1,41 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package internal + +import ( + "bytes" + "io" + "testing" + + "github.com/stretchr/testify/require" +) + +func Test_zstdCodec_CompressDecompress(t *testing.T) { + // prepare + msg := []byte("Hello world.") + compressed := &bytes.Buffer{} + + // zstd header, for sanity checking + header := []byte{40, 181, 47, 253} + + c := NewZstdCodec() + cWriter, err := c.Compress(compressed) + require.NoError(t, err) + require.NotNil(t, cWriter) + + _, err = cWriter.Write(msg) + require.NoError(t, err) + cWriter.Close() + + cReader, err := c.Decompress(compressed) + require.NoError(t, err) + require.NotNil(t, cReader) + + uncompressed, err := io.ReadAll(cReader) + require.NoError(t, err) + require.Equal(t, msg, uncompressed) + + // test header + require.Equal(t, header, compressed.Bytes()[:4]) +} diff --git a/receiver/otlpreceiver/otlp_test.go b/receiver/otlpreceiver/otlp_test.go index 51f99bb4cb8..14eecbcdac1 100644 --- a/receiver/otlpreceiver/otlp_test.go +++ b/receiver/otlpreceiver/otlp_test.go @@ -726,7 +726,8 @@ func TestGRPCMaxRecvSize(t *testing.T) { require.NoError(t, err) td := testdata.GenerateTraces(50000) - require.Error(t, exportTraces(cc, td)) + err = exportTraces(cc, td) + require.Error(t, err) assert.NoError(t, cc.Close()) require.NoError(t, recv.Shutdown(context.Background())) From 7218b4cd1d66a627a44f5b19f8e2046a291e7826 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 5 Jun 2024 14:03:09 +0000 Subject: [PATCH 035/168] prepare release 0.102.1 (#10326) #### Description Step 2 of release process > Make sure you are on release/. Prepare release commits with prepare-release make target, e.g. make prepare-release PREVIOUS_VERSION=0.90.0 RELEASE_CANDIDATE=0.90.1 MODSET=beta, and create a pull request against the release/ branch. --- cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 40 ++++++------ cmd/builder/test/core.builder.yaml | 8 +-- cmd/mdatagen/go.mod | 16 ++--- cmd/otelcorecol/builder-config.yaml | 40 ++++++------ cmd/otelcorecol/go.mod | 80 ++++++++++++------------ cmd/otelcorecol/main.go | 2 +- component/go.mod | 4 +- config/configauth/go.mod | 10 +-- config/configgrpc/go.mod | 22 +++---- config/confighttp/go.mod | 18 +++--- config/configopaque/go.mod | 2 +- config/internal/go.mod | 2 +- confmap/converter/expandconverter/go.mod | 2 +- confmap/provider/envprovider/go.mod | 2 +- confmap/provider/fileprovider/go.mod | 2 +- confmap/provider/httpprovider/go.mod | 2 +- confmap/provider/httpsprovider/go.mod | 2 +- confmap/provider/yamlprovider/go.mod | 2 +- connector/forwardconnector/go.mod | 12 ++-- connector/go.mod | 12 ++-- consumer/go.mod | 2 +- exporter/debugexporter/go.mod | 20 +++--- exporter/go.mod | 18 +++--- exporter/loggingexporter/go.mod | 18 +++--- exporter/nopexporter/go.mod | 12 ++-- exporter/otlpexporter/go.mod | 32 +++++----- exporter/otlphttpexporter/go.mod | 28 ++++----- extension/auth/go.mod | 8 +-- extension/ballastextension/go.mod | 10 +-- extension/go.mod | 6 +- extension/memorylimiterextension/go.mod | 10 +-- extension/zpagesextension/go.mod | 12 ++-- filter/go.mod | 2 +- go.mod | 10 +-- internal/e2e/go.mod | 34 +++++----- otelcol/go.mod | 38 +++++------ processor/batchprocessor/go.mod | 14 ++--- processor/go.mod | 12 ++-- processor/memorylimiterprocessor/go.mod | 14 ++--- receiver/go.mod | 10 +-- receiver/nopreceiver/go.mod | 10 +-- receiver/otlpreceiver/go.mod | 30 ++++----- service/go.mod | 28 ++++----- versions.yaml | 2 +- 45 files changed, 331 insertions(+), 331 deletions(-) diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 823b2d6d6a6..98cd9213d2f 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -17,7 +17,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.102.0" +const defaultOtelColVersion = "0.102.1" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index ef856ea9137..f4e1f908b94 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,32 +2,32 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.102.0-dev - otelcol_version: 0.102.0 + version: 0.102.1-dev + otelcol_version: 0.102.1 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.0 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.1 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.102.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.0 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.1 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.1 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.1 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.1 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.1 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index cfe24f8e334..e4abafd2800 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.102.0 + otelcol_version: 0.102.1 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.102.0 + gomod: go.opentelemetry.io/collector v0.102.1 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.102.0 + gomod: go.opentelemetry.io/collector v0.102.1 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/debugexporter - gomod: go.opentelemetry.io/collector v0.102.0 + gomod: go.opentelemetry.io/collector v0.102.1 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 8134e9c77d5..a4193aedcc9 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -5,15 +5,15 @@ go 1.21.0 require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 - go.opentelemetry.io/collector/filter v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 + go.opentelemetry.io/collector/filter v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/receiver v0.102.0 - go.opentelemetry.io/collector/semconv v0.102.0 + go.opentelemetry.io/collector/receiver v0.102.1 + go.opentelemetry.io/collector/semconv v0.102.1 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 3f67cc06834..2a1390befe3 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,34 +2,34 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.102.0-dev - otelcol_version: 0.102.0 + version: 0.102.1-dev + otelcol_version: 0.102.1 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.0 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.1 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.102.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.0 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.1 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.1 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.1 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.1 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.1 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index d287217ea4d..92ad5205864 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -7,33 +7,33 @@ go 1.21.0 toolchain go1.21.11 require ( - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.0 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.0 - go.opentelemetry.io/collector/connector v0.102.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.102.0 - go.opentelemetry.io/collector/exporter v0.102.0 - go.opentelemetry.io/collector/exporter/debugexporter v0.102.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.102.0 - go.opentelemetry.io/collector/exporter/nopexporter v0.102.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.102.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.0 - go.opentelemetry.io/collector/extension v0.102.0 - go.opentelemetry.io/collector/extension/ballastextension v0.102.0 - go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.102.0 - go.opentelemetry.io/collector/otelcol v0.102.0 - go.opentelemetry.io/collector/processor v0.102.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.102.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.0 - go.opentelemetry.io/collector/receiver v0.102.0 - go.opentelemetry.io/collector/receiver/nopreceiver v0.102.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 + go.opentelemetry.io/collector/connector v0.102.1 + go.opentelemetry.io/collector/connector/forwardconnector v0.102.1 + go.opentelemetry.io/collector/exporter v0.102.1 + go.opentelemetry.io/collector/exporter/debugexporter v0.102.1 + go.opentelemetry.io/collector/exporter/loggingexporter v0.102.1 + go.opentelemetry.io/collector/exporter/nopexporter v0.102.1 + go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1 + go.opentelemetry.io/collector/extension v0.102.1 + go.opentelemetry.io/collector/extension/ballastextension v0.102.1 + go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1 + go.opentelemetry.io/collector/extension/zpagesextension v0.102.1 + go.opentelemetry.io/collector/otelcol v0.102.1 + go.opentelemetry.io/collector/processor v0.102.1 + go.opentelemetry.io/collector/processor/batchprocessor v0.102.1 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.1 + go.opentelemetry.io/collector/receiver v0.102.1 + go.opentelemetry.io/collector/receiver/nopreceiver v0.102.1 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1 golang.org/x/sys v0.20.0 ) @@ -79,23 +79,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.102.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect + go.opentelemetry.io/collector v0.102.1 // indirect + go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.102.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.102.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.102.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.102.1 // indirect + go.opentelemetry.io/collector/config/confighttp v0.102.1 // indirect + go.opentelemetry.io/collector/config/confignet v0.102.1 // indirect go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.102.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.102.0 // indirect - go.opentelemetry.io/collector/config/internal v0.102.0 // indirect - go.opentelemetry.io/collector/consumer v0.102.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtls v0.102.1 // indirect + go.opentelemetry.io/collector/config/internal v0.102.1 // indirect + go.opentelemetry.io/collector/consumer v0.102.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect - go.opentelemetry.io/collector/semconv v0.102.0 // indirect - go.opentelemetry.io/collector/service v0.102.0 // indirect + go.opentelemetry.io/collector/semconv v0.102.1 // indirect + go.opentelemetry.io/collector/service v0.102.1 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index b392b8478ed..8d43a502790 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -21,7 +21,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.102.0-dev", + Version: "0.102.1-dev", } set := otelcol.CollectorSettings{ diff --git a/component/go.mod b/component/go.mod index 1779928a047..1f71442d7bc 100644 --- a/component/go.mod +++ b/component/go.mod @@ -7,8 +7,8 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.53.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/exporters/prometheus v0.49.0 diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 4fb381869be..74e02545163 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -4,9 +4,9 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/extension v0.102.0 - go.opentelemetry.io/collector/extension/auth v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/extension v0.102.1 + go.opentelemetry.io/collector/extension/auth v0.102.1 go.uber.org/goleak v1.3.0 ) @@ -20,8 +20,8 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 960a0d96376..b85e090a6dc 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -6,18 +6,18 @@ require ( github.com/klauspost/compress v1.17.2 github.com/mostynb/go-grpc-compression v1.2.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configauth v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configauth v0.102.1 go.opentelemetry.io/collector/config/configcompression v1.9.0 - go.opentelemetry.io/collector/config/confignet v0.102.0 + go.opentelemetry.io/collector/config/confignet v0.102.1 go.opentelemetry.io/collector/config/configopaque v1.9.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/config/configtls v0.102.0 - go.opentelemetry.io/collector/config/internal v0.102.0 - go.opentelemetry.io/collector/extension/auth v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/config/configtls v0.102.1 + go.opentelemetry.io/collector/config/internal v0.102.1 + go.opentelemetry.io/collector/extension/auth v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 @@ -49,8 +49,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.0 // indirect - go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.1 // indirect + go.opentelemetry.io/collector/extension v0.102.1 // indirect go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index ccc480abee9..2f564cab511 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -7,15 +7,15 @@ require ( github.com/klauspost/compress v1.17.8 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configauth v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configauth v0.102.1 go.opentelemetry.io/collector/config/configcompression v1.9.0 go.opentelemetry.io/collector/config/configopaque v1.9.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/config/configtls v0.102.0 - go.opentelemetry.io/collector/config/internal v0.102.0 - go.opentelemetry.io/collector/extension/auth v0.102.0 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/config/configtls v0.102.1 + go.opentelemetry.io/collector/config/internal v0.102.1 + go.opentelemetry.io/collector/extension/auth v0.102.1 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 @@ -44,8 +44,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.0 // indirect - go.opentelemetry.io/collector/extension v0.102.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.1 // indirect + go.opentelemetry.io/collector/extension v0.102.1 // indirect go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/config/configopaque/go.mod b/config/configopaque/go.mod index a7e1d8b16fc..c630c49e211 100644 --- a/config/configopaque/go.mod +++ b/config/configopaque/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.1 go.uber.org/goleak v1.3.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/config/internal/go.mod b/config/internal/go.mod index 58a6cd39ea3..bc1c7f91db0 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 + go.opentelemetry.io/collector v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index a07898765bf..1ebfb017ef5 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index 6149ddd9f90..8a63caa16aa 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index 3957af3d889..1cd1b19ae89 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.1 go.uber.org/goleak v1.3.0 ) diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index fb3bb4c2564..98635b9e38a 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.1 go.uber.org/goleak v1.3.0 ) diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index 56d3a32d68b..db706391d33 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.1 go.uber.org/goleak v1.3.0 ) diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index 8cdfedac27e..0c95589e241 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.1 go.uber.org/goleak v1.3.0 ) diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index ff8290dedfd..ad54a54ee28 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/connector v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/connector v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 go.uber.org/goleak v1.3.0 ) @@ -34,8 +34,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.102.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/connector/go.mod b/connector/go.mod index 79ea896c9e2..44e688ce725 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -36,8 +36,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index 95294696e4c..8bf242ef3bd 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -5,7 +5,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 go.uber.org/goleak v1.3.0 ) diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 9d13f07b4ce..d7c19eb7302 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -4,13 +4,13 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 - go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 + go.opentelemetry.io/collector/exporter v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -38,10 +38,10 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.102.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.102.0 // indirect - go.opentelemetry.io/collector/extension v0.102.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.0 // indirect + go.opentelemetry.io/collector v0.102.1 // indirect + go.opentelemetry.io/collector/config/configretry v0.102.1 // indirect + go.opentelemetry.io/collector/extension v0.102.1 // indirect + go.opentelemetry.io/collector/receiver v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/go.mod b/exporter/go.mod index dcb56b9c0a6..0f69341aaf8 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,15 +6,15 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configretry v0.102.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 - go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configretry v0.102.1 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 + go.opentelemetry.io/collector/extension v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 - go.opentelemetry.io/collector/receiver v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector/receiver v0.102.1 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 @@ -48,7 +48,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/text v0.15.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 9797bcbfb54..f43fd0be4d3 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -5,10 +5,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/exporter v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -37,11 +37,11 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.102.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.102.0 // indirect - go.opentelemetry.io/collector/consumer v0.102.0 // indirect - go.opentelemetry.io/collector/extension v0.102.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.0 // indirect + go.opentelemetry.io/collector v0.102.1 // indirect + go.opentelemetry.io/collector/config/configretry v0.102.1 // indirect + go.opentelemetry.io/collector/consumer v0.102.1 // indirect + go.opentelemetry.io/collector/extension v0.102.1 // indirect + go.opentelemetry.io/collector/receiver v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index 8a6bbb8d2db..0df9fd3821e 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 - go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 + go.opentelemetry.io/collector/exporter v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 go.uber.org/goleak v1.3.0 ) @@ -34,8 +34,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/receiver v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 49ba938a326..56481b61f9a 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,19 +4,19 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configauth v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configauth v0.102.1 go.opentelemetry.io/collector/config/configcompression v1.9.0 - go.opentelemetry.io/collector/config/configgrpc v0.102.0 + go.opentelemetry.io/collector/config/configgrpc v0.102.1 go.opentelemetry.io/collector/config/configopaque v1.9.0 - go.opentelemetry.io/collector/config/configretry v0.102.0 - go.opentelemetry.io/collector/config/configtls v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 - go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/config/configretry v0.102.1 + go.opentelemetry.io/collector/config/configtls v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 + go.opentelemetry.io/collector/exporter v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -53,13 +53,13 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.102.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/config/internal v0.102.0 // indirect - go.opentelemetry.io/collector/extension v0.102.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/config/internal v0.102.1 // indirect + go.opentelemetry.io/collector/extension v0.102.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.0 // indirect + go.opentelemetry.io/collector/receiver v0.102.1 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 872a6c4820a..c4fcfbc5059 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,16 +4,16 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 go.opentelemetry.io/collector/config/configcompression v1.9.0 - go.opentelemetry.io/collector/config/confighttp v0.102.0 + go.opentelemetry.io/collector/config/confighttp v0.102.1 go.opentelemetry.io/collector/config/configopaque v1.9.0 - go.opentelemetry.io/collector/config/configretry v0.102.0 - go.opentelemetry.io/collector/config/configtls v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 - go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector/config/configretry v0.102.1 + go.opentelemetry.io/collector/config/configtls v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 + go.opentelemetry.io/collector/exporter v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -52,13 +52,13 @@ require ( github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/config/internal v0.102.0 // indirect - go.opentelemetry.io/collector/extension v0.102.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/config/internal v0.102.1 // indirect + go.opentelemetry.io/collector/extension v0.102.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.0 // indirect + go.opentelemetry.io/collector/receiver v0.102.1 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 03b8df9e7ec..3a5c49234b8 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -4,8 +4,8 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/extension v0.102.1 go.uber.org/goleak v1.3.0 google.golang.org/grpc v1.64.0 ) @@ -28,8 +28,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index ece09b10a0d..be3f83e6b6c 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -5,10 +5,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/extension v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -39,7 +39,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/extension/go.mod b/extension/go.mod index 4c0f8a46acc..7760bd86128 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -5,8 +5,8 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 go.uber.org/goleak v1.3.0 ) @@ -28,7 +28,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 47b1513cc01..b6df2c9e86a 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/extension v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -38,7 +38,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 5907cb0e5df..83f449976b8 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,11 +4,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/confignet v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/confignet v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/extension v0.102.1 go.opentelemetry.io/contrib/zpages v0.52.0 go.opentelemetry.io/otel/sdk v1.27.0 go.opentelemetry.io/otel/trace v1.27.0 @@ -37,7 +37,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/filter/go.mod b/filter/go.mod index 144bedf107c..8a3011a69cb 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.0 + go.opentelemetry.io/collector/confmap v0.102.1 ) require ( diff --git a/go.mod b/go.mod index b943394f1d9..2cb3d857d50 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ go 1.21.0 require ( github.com/shirou/gopsutil/v3 v3.24.4 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/featuregate v1.9.0 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 go.opentelemetry.io/contrib/config v0.7.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 @@ -48,7 +48,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 5bcd2da7ac7..a0cbd60785f 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -4,19 +4,19 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configgrpc v0.102.0 - go.opentelemetry.io/collector/config/confighttp v0.102.0 - go.opentelemetry.io/collector/config/configretry v0.102.0 - go.opentelemetry.io/collector/config/configtls v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 - go.opentelemetry.io/collector/exporter v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configgrpc v0.102.1 + go.opentelemetry.io/collector/config/confighttp v0.102.1 + go.opentelemetry.io/collector/config/configretry v0.102.1 + go.opentelemetry.io/collector/config/configtls v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 + go.opentelemetry.io/collector/exporter v0.102.1 go.opentelemetry.io/collector/exporter/otlpexporter v0.101.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.0 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 - go.opentelemetry.io/collector/receiver v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector/receiver v0.102.1 go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0 go.uber.org/goleak v1.3.0 ) @@ -52,15 +52,15 @@ require ( github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.102.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.102.1 // indirect go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/config/internal v0.102.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.0 // indirect - go.opentelemetry.io/collector/extension v0.102.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/config/internal v0.102.1 // indirect + go.opentelemetry.io/collector/confmap v0.102.1 // indirect + go.opentelemetry.io/collector/extension v0.102.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index 178b52042a8..40f978da2f8 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,22 +5,22 @@ go 1.21.0 require ( github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.0 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.0 - go.opentelemetry.io/collector/connector v0.102.0 - go.opentelemetry.io/collector/exporter v0.102.0 - go.opentelemetry.io/collector/extension v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 + go.opentelemetry.io/collector/connector v0.102.1 + go.opentelemetry.io/collector/exporter v0.102.1 + go.opentelemetry.io/collector/extension v0.102.1 go.opentelemetry.io/collector/featuregate v1.9.0 - go.opentelemetry.io/collector/processor v0.102.0 - go.opentelemetry.io/collector/receiver v0.102.0 - go.opentelemetry.io/collector/service v0.102.0 + go.opentelemetry.io/collector/processor v0.102.1 + go.opentelemetry.io/collector/receiver v0.102.1 + go.opentelemetry.io/collector/service v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -67,11 +67,11 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.102.0 // indirect - go.opentelemetry.io/collector/consumer v0.102.0 // indirect + go.opentelemetry.io/collector v0.102.1 // indirect + go.opentelemetry.io/collector/consumer v0.102.1 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.102.0 // indirect - go.opentelemetry.io/collector/semconv v0.102.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.102.1 // indirect + go.opentelemetry.io/collector/semconv v0.102.1 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index b488e925549..17fffdc8ac2 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -4,14 +4,14 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 - go.opentelemetry.io/collector/processor v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector/processor v0.102.1 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 diff --git a/processor/go.mod b/processor/go.mod index 0ed3bec0590..7b8aeedddf3 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -5,12 +5,12 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 @@ -40,7 +40,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 9962cdcef09..ee6c64cc8cb 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,12 +4,12 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/processor v0.102.0 + go.opentelemetry.io/collector/processor v0.102.1 go.uber.org/goleak v1.3.0 ) @@ -42,8 +42,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/receiver/go.mod b/receiver/go.mod index c9116c4966e..5603b533739 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -5,10 +5,10 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 @@ -41,7 +41,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.0 // indirect + go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/sys v0.20.0 // indirect diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index 2ef1c1b7bbf..ba9b0e509e2 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 - go.opentelemetry.io/collector/receiver v0.102.0 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 + go.opentelemetry.io/collector/receiver v0.102.1 go.uber.org/goleak v1.3.0 ) @@ -33,7 +33,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 779a0e15731..1b88460e0b6 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -6,17 +6,17 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/klauspost/compress v1.17.8 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/configgrpc v0.102.0 - go.opentelemetry.io/collector/config/confighttp v0.102.0 - go.opentelemetry.io/collector/config/confignet v0.102.0 - go.opentelemetry.io/collector/config/configtls v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/configgrpc v0.102.1 + go.opentelemetry.io/collector/config/confighttp v0.102.1 + go.opentelemetry.io/collector/config/confignet v0.102.1 + go.opentelemetry.io/collector/config/configtls v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 - go.opentelemetry.io/collector/receiver v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector/receiver v0.102.1 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -53,13 +53,13 @@ require ( github.com/prometheus/common v0.53.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 // indirect - go.opentelemetry.io/collector/config/internal v0.102.0 // indirect - go.opentelemetry.io/collector/extension v0.102.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/config/internal v0.102.1 // indirect + go.opentelemetry.io/collector/extension v0.102.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect diff --git a/service/go.mod b/service/go.mod index 940b05d726e..ce8f2e4673a 100644 --- a/service/go.mod +++ b/service/go.mod @@ -10,22 +10,22 @@ require ( github.com/shirou/gopsutil/v3 v3.24.4 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.102.0 - go.opentelemetry.io/collector/component v0.102.0 - go.opentelemetry.io/collector/config/confignet v0.102.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.0 - go.opentelemetry.io/collector/confmap v0.102.0 - go.opentelemetry.io/collector/connector v0.102.0 - go.opentelemetry.io/collector/consumer v0.102.0 - go.opentelemetry.io/collector/exporter v0.102.0 - go.opentelemetry.io/collector/extension v0.102.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.102.0 + go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector/component v0.102.1 + go.opentelemetry.io/collector/config/confignet v0.102.1 + go.opentelemetry.io/collector/config/configtelemetry v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/connector v0.102.1 + go.opentelemetry.io/collector/consumer v0.102.1 + go.opentelemetry.io/collector/exporter v0.102.1 + go.opentelemetry.io/collector/extension v0.102.1 + go.opentelemetry.io/collector/extension/zpagesextension v0.102.1 go.opentelemetry.io/collector/featuregate v1.9.0 go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.0 - go.opentelemetry.io/collector/processor v0.102.0 - go.opentelemetry.io/collector/receiver v0.102.0 - go.opentelemetry.io/collector/semconv v0.102.0 + go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector/processor v0.102.1 + go.opentelemetry.io/collector/receiver v0.102.1 + go.opentelemetry.io/collector/semconv v0.102.1 go.opentelemetry.io/contrib/config v0.7.0 go.opentelemetry.io/contrib/propagators/b3 v1.27.0 go.opentelemetry.io/otel v1.27.0 diff --git a/versions.yaml b/versions.yaml index 19cb0df39a0..49c6b625c58 100644 --- a/versions.yaml +++ b/versions.yaml @@ -10,7 +10,7 @@ module-sets: - go.opentelemetry.io/collector/config/configopaque - go.opentelemetry.io/collector/config/configcompression beta: - version: v0.102.0 + version: v0.102.1 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder From d5dd7a6e725f104d69cdd0721b6446d9abb17581 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 5 Jun 2024 17:01:41 +0000 Subject: [PATCH 036/168] [chore] Include explicit mention of GHSA-c74f-6mfw-mm4v in changelog (#10332) Mentions GHSA-c74f-6mfw-mm4v explicitly in the changelog --- ...ing-configgrpc-use-own-compressors-for-zstd.yaml | 13 ------------- CHANGELOG-API.md | 6 ++++++ CHANGELOG.md | 12 +++++++++++- 3 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 .chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml diff --git a/.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml b/.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml deleted file mode 100644 index a04c4f89012..00000000000 --- a/.chloggen/jpkroehling-configgrpc-use-own-compressors-for-zstd.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: 'bug_fix' - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: Use own compressors for zstd - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Before this change, the zstd compressor we used didn't respect the max message size. - -# One or more tracking issues or pull requests related to the change -issues: [10323] diff --git a/CHANGELOG-API.md b/CHANGELOG-API.md index 3851896f2cd..5a2464dda0c 100644 --- a/CHANGELOG-API.md +++ b/CHANGELOG-API.md @@ -7,8 +7,14 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG +## v0.102.1 + +No API-only changes on this release. **This release addresses [GHSA-c74f-6mfw-mm4v](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `configgrpc`.** + ## v1.9.0/v0.102.0 +**This release addresses [GHSA-c74f-6mfw-mm4v](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `confighttp`.** + ### 🛑 Breaking changes 🛑 - `otelcol`: Remove deprecated `ConfigProvider` field from `CollectorSettings` (#10281) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8aa47185c9..57c96822e00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,22 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./ +## v0.102.1 + +**This release addresses [GHSA-c74f-6mfw-mm4v](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `configgrpc`.** + +### 🧰 Bug fixes 🧰 + +- `configrpc`: Use own compressors for zstd. Before this change, the zstd compressor we used didn't respect the max message size. This addresses [GHSA-c74f-6mfw-mm4v](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `configgrpc` (#10323) + ## v1.9.0/v0.102.0 +**This release addresses [GHSA-c74f-6mfw-mm4v](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `confighttp`.** + ### 🛑 Breaking changes 🛑 - `envprovider`: Restricts Environment Variable names. Environment variable names must now be ASCII only and start with a letter or an underscore, and can only contain underscores, letters, or numbers. (#9531) -- `confighttp`: Apply MaxRequestBodySize to the result of a decompressed body (#10289) +- `confighttp`: Apply MaxRequestBodySize to the result of a decompressed body. This addresses [GHSA-c74f-6mfw-mm4v](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `confighttp` (#10289) When using compressed payloads, the Collector would verify only the size of the compressed payload. This change applies the same restriction to the decompressed content. As a security measure, a limit of 20 MiB was added, which makes this a breaking change. For most clients, this shouldn't be a problem, but if you often have payloads that decompress to more than 20 MiB, you might want to either configure your From 1e44a9c473467a9a449abbd307b4b9030d055ab0 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:57:23 -0700 Subject: [PATCH 037/168] [receiver] deprecate CreateSettings -> Settings (#10333) This deprecates CreateSettings in favour of Settings. NewNopCreateSettings is also being deprecated in favour of NewNopSettings Part of #9428 --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_create-settings-receiver.yaml | 28 +++++++++++++++ .../internal/samplereceiver/factory.go | 6 ++-- .../generated_component_telemetry_test.go | 4 +-- .../generated_component_test.go | 14 ++++---- .../internal/metadata/generated_metrics.go | 2 +- .../metadata/generated_metrics_test.go | 2 +- .../internal/samplereceiver/metrics_test.go | 4 +-- .../component_telemetry_test.go.tmpl | 11 ++++++ cmd/mdatagen/templates/component_test.go.tmpl | 14 ++++---- cmd/mdatagen/templates/metrics.go.tmpl | 2 +- cmd/mdatagen/templates/metrics_test.go.tmpl | 2 +- exporter/exportertest/contract_checker.go | 6 ++-- .../exportertest/contract_checker_test.go | 6 ++-- internal/e2e/otlphttp_test.go | 6 ++-- .../nopreceiver/generated_component_test.go | 14 ++++---- receiver/nopreceiver/nop_receiver.go | 6 ++-- receiver/nopreceiver/nop_receiver_test.go | 6 ++-- receiver/otlpreceiver/factory.go | 6 ++-- receiver/otlpreceiver/factory_test.go | 8 ++--- .../otlpreceiver/generated_component_test.go | 14 ++++---- .../otlpreceiver/internal/logs/otlp_test.go | 2 +- .../internal/metrics/otlp_test.go | 2 +- .../otlpreceiver/internal/trace/otlp_test.go | 2 +- receiver/otlpreceiver/otlp.go | 4 +-- receiver/otlpreceiver/otlp_test.go | 8 ++--- receiver/receiver.go | 31 ++++++++++------- receiver/receiver_test.go | 34 +++++++++---------- .../generated_component_telemetry_test.go | 4 +-- receiver/receiverhelper/obsreport.go | 2 +- receiver/receiverhelper/obsreport_test.go | 14 ++++---- receiver/receivertest/contract_checker.go | 6 ++-- .../receivertest/contract_checker_test.go | 6 ++-- receiver/receivertest/nop_receiver.go | 17 +++++++--- receiver/receivertest/nop_receiver_test.go | 8 ++--- .../generated_component_telemetry_test.go | 4 +-- receiver/scraperhelper/obsreport.go | 2 +- receiver/scraperhelper/obsreport_test.go | 4 +-- receiver/scraperhelper/scrapercontroller.go | 4 +-- .../scraperhelper/scrapercontroller_test.go | 8 ++--- service/internal/graph/graph_test.go | 6 ++-- service/internal/graph/nodes.go | 2 +- .../testcomponents/example_receiver.go | 6 ++-- 42 files changed, 194 insertions(+), 143 deletions(-) create mode 100644 .chloggen/codeboten_create-settings-receiver.yaml diff --git a/.chloggen/codeboten_create-settings-receiver.yaml b/.chloggen/codeboten_create-settings-receiver.yaml new file mode 100644 index 00000000000..9afcb42c231 --- /dev/null +++ b/.chloggen/codeboten_create-settings-receiver.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: receiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate CreateSettings and NewNopCreateSettings + +# One or more tracking issues or pull requests related to the change +issues: [9428] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The following methods are being renamed: + - receiver.CreateSettings -> receiver.Settings + - receiver.NewNopCreateSettings -> receiver.NewNopSettings + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/cmd/mdatagen/internal/samplereceiver/factory.go b/cmd/mdatagen/internal/samplereceiver/factory.go index 565305d540c..f4e425c4c5e 100644 --- a/cmd/mdatagen/internal/samplereceiver/factory.go +++ b/cmd/mdatagen/internal/samplereceiver/factory.go @@ -22,11 +22,11 @@ func NewFactory() receiver.Factory { receiver.WithLogs(createLogs, metadata.LogsStability)) } -func createTraces(context.Context, receiver.CreateSettings, component.Config, consumer.Traces) (receiver.Traces, error) { +func createTraces(context.Context, receiver.Settings, component.Config, consumer.Traces) (receiver.Traces, error) { return nopInstance, nil } -func createMetrics(ctx context.Context, set receiver.CreateSettings, _ component.Config, _ consumer.Metrics) (receiver.Metrics, error) { +func createMetrics(ctx context.Context, set receiver.Settings, _ component.Config, _ consumer.Metrics) (receiver.Metrics, error) { telemetryBuilder, err := metadata.NewTelemetryBuilder(set.TelemetrySettings, metadata.WithProcessRuntimeTotalAllocBytesCallback(func() int64 { return 2 })) if err != nil { return nil, err @@ -35,7 +35,7 @@ func createMetrics(ctx context.Context, set receiver.CreateSettings, _ component return nopInstance, nil } -func createLogs(context.Context, receiver.CreateSettings, component.Config, consumer.Logs) (receiver.Logs, error) { +func createLogs(context.Context, receiver.Settings, component.Config, consumer.Logs) (receiver.Logs, error) { return nopInstance, nil } diff --git a/cmd/mdatagen/internal/samplereceiver/generated_component_telemetry_test.go b/cmd/mdatagen/internal/samplereceiver/generated_component_telemetry_test.go index e8cf2fe05e9..e0a3e1cb559 100644 --- a/cmd/mdatagen/internal/samplereceiver/generated_component_telemetry_test.go +++ b/cmd/mdatagen/internal/samplereceiver/generated_component_telemetry_test.go @@ -21,8 +21,8 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -func (tt *componentTestTelemetry) NewCreateSettings() receiver.CreateSettings { - settings := receivertest.NewNopCreateSettings() +func (tt *componentTestTelemetry) NewSettings() receiver.Settings { + settings := receivertest.NewNopSettings() settings.MeterProvider = tt.meterProvider settings.ID = component.NewID(component.MustNewType("sample")) diff --git a/cmd/mdatagen/internal/samplereceiver/generated_component_test.go b/cmd/mdatagen/internal/samplereceiver/generated_component_test.go index d20ac9b6b4f..46616a207e5 100644 --- a/cmd/mdatagen/internal/samplereceiver/generated_component_test.go +++ b/cmd/mdatagen/internal/samplereceiver/generated_component_test.go @@ -30,26 +30,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "metrics", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "traces", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -64,19 +64,19 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() require.NoError(t, err) require.NoError(t, firstRcvr.Start(context.Background(), host)) require.NoError(t, firstRcvr.Shutdown(context.Background())) - secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondRcvr.Start(context.Background(), host)) require.NoError(t, secondRcvr.Shutdown(context.Background())) diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go index 344599e2c40..b05bf39206d 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go @@ -341,7 +341,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.Settings, options ...metricBuilderOption) *MetricsBuilder { if !mbc.Metrics.DefaultMetric.enabledSetByUser { settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `default.metric`: This metric will be disabled by default soon.") } diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics_test.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics_test.go index b6214e5d894..657e400408b 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics_test.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics_test.go @@ -58,7 +58,7 @@ func TestMetricsBuilder(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := receivertest.NewNopCreateSettings() + settings := receivertest.NewNopSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(loadMetricsBuilderConfig(t, test.name), settings, WithStartTime(start)) diff --git a/cmd/mdatagen/internal/samplereceiver/metrics_test.go b/cmd/mdatagen/internal/samplereceiver/metrics_test.go index 2c3dd5675a5..3055b1dea31 100644 --- a/cmd/mdatagen/internal/samplereceiver/metrics_test.go +++ b/cmd/mdatagen/internal/samplereceiver/metrics_test.go @@ -18,7 +18,7 @@ import ( // TestGeneratedMetrics verifies that the internal/metadata API is generated correctly. func TestGeneratedMetrics(t *testing.T) { - mb := metadata.NewMetricsBuilder(metadata.DefaultMetricsBuilderConfig(), receivertest.NewNopCreateSettings()) + mb := metadata.NewMetricsBuilder(metadata.DefaultMetricsBuilderConfig(), receivertest.NewNopSettings()) m := mb.Emit() require.Equal(t, 0, m.ResourceMetrics().Len()) } @@ -26,7 +26,7 @@ func TestGeneratedMetrics(t *testing.T) { func TestComponentTelemetry(t *testing.T) { tt := setupTestTelemetry() factory := NewFactory() - _, err := factory.CreateMetricsReceiver(context.Background(), tt.NewCreateSettings(), componenttest.NewNopHost(), new(consumertest.MetricsSink)) + _, err := factory.CreateMetricsReceiver(context.Background(), tt.NewSettings(), componenttest.NewNopHost(), new(consumertest.MetricsSink)) require.NoError(t, err) tt.assertMetrics(t, []metricdata.Metrics{ { diff --git a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl index adba6355149..03a702acd00 100644 --- a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl +++ b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl @@ -21,6 +21,16 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } +{{- if isReceiver }} +func (tt *componentTestTelemetry) NewSettings() {{ .Status.Class }}.Settings { + settings := {{ .Status.Class }}test.NewNopSettings() + settings.MeterProvider = tt.meterProvider + settings.ID = component.NewID(component.MustNewType("{{ .Type }}")) + + return settings +} + +{{ else }} func (tt *componentTestTelemetry) NewCreateSettings() {{ .Status.Class }}.CreateSettings { settings := {{ .Status.Class }}test.NewNopCreateSettings() settings.MeterProvider = tt.meterProvider @@ -29,6 +39,7 @@ func (tt *componentTestTelemetry) NewCreateSettings() {{ .Status.Class }}.Create return settings } +{{ end }} func setupTestTelemetry() componentTestTelemetry { reader := sdkmetric.NewManualReader() return componentTestTelemetry{ diff --git a/cmd/mdatagen/templates/component_test.go.tmpl b/cmd/mdatagen/templates/component_test.go.tmpl index f44efb7310c..fe6a1786936 100644 --- a/cmd/mdatagen/templates/component_test.go.tmpl +++ b/cmd/mdatagen/templates/component_test.go.tmpl @@ -261,12 +261,12 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct{ name string - createFn func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) }{ {{ if supportsLogs }} { name: "logs", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -274,7 +274,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsMetrics }} { name: "metrics", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -282,7 +282,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsTraces }} { name: "traces", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -299,7 +299,7 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { {{- if not .Tests.SkipShutdown }} t.Run(test.name + "-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) @@ -308,13 +308,13 @@ func TestComponentLifecycle(t *testing.T) { {{- if not .Tests.SkipLifecycle }} t.Run(test.name + "-lifecycle", func(t *testing.T) { - firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() require.NoError(t, err) require.NoError(t, firstRcvr.Start(context.Background(), host)) require.NoError(t, firstRcvr.Shutdown(context.Background())) - secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondRcvr.Start(context.Background(), host)) require.NoError(t, secondRcvr.Shutdown(context.Background())) diff --git a/cmd/mdatagen/templates/metrics.go.tmpl b/cmd/mdatagen/templates/metrics.go.tmpl index 14428451c1e..a084d847ee8 100644 --- a/cmd/mdatagen/templates/metrics.go.tmpl +++ b/cmd/mdatagen/templates/metrics.go.tmpl @@ -154,7 +154,7 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } } -func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { +func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.Settings, options ...metricBuilderOption) *MetricsBuilder { {{- range $name, $metric := .Metrics }} {{- if $metric.Warnings.IfEnabled }} if mbc.Metrics.{{ $name.Render }}.Enabled { diff --git a/cmd/mdatagen/templates/metrics_test.go.tmpl b/cmd/mdatagen/templates/metrics_test.go.tmpl index 13342842eab..f97e8ef8110 100644 --- a/cmd/mdatagen/templates/metrics_test.go.tmpl +++ b/cmd/mdatagen/templates/metrics_test.go.tmpl @@ -60,7 +60,7 @@ func TestMetricsBuilder(t *testing.T) { start := pcommon.Timestamp(1_000_000_000) ts := pcommon.Timestamp(1_000_001_000) observedZapCore, observedLogs := observer.New(zap.WarnLevel) - settings := receivertest.NewNopCreateSettings() + settings := receivertest.NewNopSettings() settings.Logger = zap.New(observedZapCore) mb := NewMetricsBuilder(loadMetricsBuilderConfig(t, test.name), settings, WithStartTime(start)) diff --git a/exporter/exportertest/contract_checker.go b/exporter/exportertest/contract_checker.go index 7b3f55c1902..cf9eec1dbb4 100644 --- a/exporter/exportertest/contract_checker.go +++ b/exporter/exportertest/contract_checker.go @@ -86,17 +86,17 @@ func checkConsumeContractScenario(t *testing.T, params CheckConsumeContractParam mockConsumerInstance := newMockConsumer(decisionFunc) switch params.DataType { case component.DataTypeLogs: - r, err := params.ReceiverFactory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), params.ReceiverConfig, &mockConsumerInstance) + r, err := params.ReceiverFactory.CreateLogsReceiver(context.Background(), receivertest.NewNopSettings(), params.ReceiverConfig, &mockConsumerInstance) require.NoError(t, err) require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost())) checkLogs(t, params, r, &mockConsumerInstance, checkIfTestPassed) case component.DataTypeTraces: - r, err := params.ReceiverFactory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), params.ReceiverConfig, &mockConsumerInstance) + r, err := params.ReceiverFactory.CreateTracesReceiver(context.Background(), receivertest.NewNopSettings(), params.ReceiverConfig, &mockConsumerInstance) require.NoError(t, err) require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost())) checkTraces(t, params, r, &mockConsumerInstance, checkIfTestPassed) case component.DataTypeMetrics: - r, err := params.ReceiverFactory.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), params.ReceiverConfig, &mockConsumerInstance) + r, err := params.ReceiverFactory.CreateMetricsReceiver(context.Background(), receivertest.NewNopSettings(), params.ReceiverConfig, &mockConsumerInstance) require.NoError(t, err) require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost())) checkMetrics(t, params, r, &mockConsumerInstance, checkIfTestPassed) diff --git a/exporter/exportertest/contract_checker_test.go b/exporter/exportertest/contract_checker_test.go index 7b0a6d5abb3..97135bbb2c5 100644 --- a/exporter/exportertest/contract_checker_test.go +++ b/exporter/exportertest/contract_checker_test.go @@ -89,15 +89,15 @@ func newMockExporterFactory(mr *mockReceiver) exporter.Factory { func newMockReceiverFactory(mr *mockReceiver) receiver.Factory { return receiver.NewFactory(component.MustNewType("pass_through_receiver"), func() component.Config { return &nopConfig{} }, - receiver.WithTraces(func(_ context.Context, _ receiver.CreateSettings, _ component.Config, c consumer.Traces) (receiver.Traces, error) { + receiver.WithTraces(func(_ context.Context, _ receiver.Settings, _ component.Config, c consumer.Traces) (receiver.Traces, error) { mr.Traces = c return mr, nil }, component.StabilityLevelStable), - receiver.WithMetrics(func(_ context.Context, _ receiver.CreateSettings, _ component.Config, c consumer.Metrics) (receiver.Metrics, error) { + receiver.WithMetrics(func(_ context.Context, _ receiver.Settings, _ component.Config, c consumer.Metrics) (receiver.Metrics, error) { mr.Metrics = c return mr, nil }, component.StabilityLevelStable), - receiver.WithLogs(func(_ context.Context, _ receiver.CreateSettings, _ component.Config, c consumer.Logs) (receiver.Logs, error) { + receiver.WithLogs(func(_ context.Context, _ receiver.Settings, _ component.Config, c consumer.Logs) (receiver.Logs, error) { mr.Logs = c return mr, nil }, component.StabilityLevelStable), diff --git a/internal/e2e/otlphttp_test.go b/internal/e2e/otlphttp_test.go index b173dcf59d7..3c2f41ffc15 100644 --- a/internal/e2e/otlphttp_test.go +++ b/internal/e2e/otlphttp_test.go @@ -328,7 +328,7 @@ func createExporterConfig(baseURL string, defaultCfg component.Config) *otlphttp func startTracesReceiver(t *testing.T, addr string, next consumer.Traces) { factory := otlpreceiver.NewFactory() cfg := createReceiverConfig(addr, factory.CreateDefaultConfig()) - recv, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, next) + recv, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopSettings(), cfg, next) require.NoError(t, err) startAndCleanup(t, recv) } @@ -336,7 +336,7 @@ func startTracesReceiver(t *testing.T, addr string, next consumer.Traces) { func startMetricsReceiver(t *testing.T, addr string, next consumer.Metrics) { factory := otlpreceiver.NewFactory() cfg := createReceiverConfig(addr, factory.CreateDefaultConfig()) - recv, err := factory.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, next) + recv, err := factory.CreateMetricsReceiver(context.Background(), receivertest.NewNopSettings(), cfg, next) require.NoError(t, err) startAndCleanup(t, recv) } @@ -344,7 +344,7 @@ func startMetricsReceiver(t *testing.T, addr string, next consumer.Metrics) { func startLogsReceiver(t *testing.T, addr string, next consumer.Logs) { factory := otlpreceiver.NewFactory() cfg := createReceiverConfig(addr, factory.CreateDefaultConfig()) - recv, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, next) + recv, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopSettings(), cfg, next) require.NoError(t, err) startAndCleanup(t, recv) } diff --git a/receiver/nopreceiver/generated_component_test.go b/receiver/nopreceiver/generated_component_test.go index 92e563ad645..9f4d59328e2 100644 --- a/receiver/nopreceiver/generated_component_test.go +++ b/receiver/nopreceiver/generated_component_test.go @@ -29,26 +29,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "metrics", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "traces", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -63,19 +63,19 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() require.NoError(t, err) require.NoError(t, firstRcvr.Start(context.Background(), host)) require.NoError(t, firstRcvr.Shutdown(context.Background())) - secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondRcvr.Start(context.Background(), host)) require.NoError(t, secondRcvr.Shutdown(context.Background())) diff --git a/receiver/nopreceiver/nop_receiver.go b/receiver/nopreceiver/nop_receiver.go index 2463a89ef65..6d989daffc9 100644 --- a/receiver/nopreceiver/nop_receiver.go +++ b/receiver/nopreceiver/nop_receiver.go @@ -22,15 +22,15 @@ func NewFactory() receiver.Factory { receiver.WithLogs(createLogs, metadata.LogsStability)) } -func createTraces(context.Context, receiver.CreateSettings, component.Config, consumer.Traces) (receiver.Traces, error) { +func createTraces(context.Context, receiver.Settings, component.Config, consumer.Traces) (receiver.Traces, error) { return nopInstance, nil } -func createMetrics(context.Context, receiver.CreateSettings, component.Config, consumer.Metrics) (receiver.Metrics, error) { +func createMetrics(context.Context, receiver.Settings, component.Config, consumer.Metrics) (receiver.Metrics, error) { return nopInstance, nil } -func createLogs(context.Context, receiver.CreateSettings, component.Config, consumer.Logs) (receiver.Logs, error) { +func createLogs(context.Context, receiver.Settings, component.Config, consumer.Logs) (receiver.Logs, error) { return nopInstance, nil } diff --git a/receiver/nopreceiver/nop_receiver_test.go b/receiver/nopreceiver/nop_receiver_test.go index 31f78e10756..85518f47a49 100644 --- a/receiver/nopreceiver/nop_receiver_test.go +++ b/receiver/nopreceiver/nop_receiver_test.go @@ -23,17 +23,17 @@ func TestNewNopFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &struct{}{}, cfg) - traces, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) + traces, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, traces.Shutdown(context.Background())) - metrics, err := factory.CreateMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) + metrics, err := factory.CreateMetricsReceiver(context.Background(), receivertest.NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, metrics.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, metrics.Shutdown(context.Background())) - logs, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) + logs, err := factory.CreateLogsReceiver(context.Background(), receivertest.NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, logs.Shutdown(context.Background())) diff --git a/receiver/otlpreceiver/factory.go b/receiver/otlpreceiver/factory.go index 4b148c40be3..22181929879 100644 --- a/receiver/otlpreceiver/factory.go +++ b/receiver/otlpreceiver/factory.go @@ -64,7 +64,7 @@ func createDefaultConfig() component.Config { // createTraces creates a trace receiver based on provided config. func createTraces( _ context.Context, - set receiver.CreateSettings, + set receiver.Settings, cfg component.Config, nextConsumer consumer.Traces, ) (receiver.Traces, error) { @@ -87,7 +87,7 @@ func createTraces( // createMetrics creates a metrics receiver based on provided config. func createMetrics( _ context.Context, - set receiver.CreateSettings, + set receiver.Settings, cfg component.Config, consumer consumer.Metrics, ) (receiver.Metrics, error) { @@ -110,7 +110,7 @@ func createMetrics( // createLog creates a log receiver based on provided config. func createLog( _ context.Context, - set receiver.CreateSettings, + set receiver.Settings, cfg component.Config, consumer consumer.Logs, ) (receiver.Logs, error) { diff --git a/receiver/otlpreceiver/factory_test.go b/receiver/otlpreceiver/factory_test.go index d844760947f..4a4477f38c4 100644 --- a/receiver/otlpreceiver/factory_test.go +++ b/receiver/otlpreceiver/factory_test.go @@ -33,7 +33,7 @@ func TestCreateSameReceiver(t *testing.T) { cfg.GRPC.NetAddr.Endpoint = testutil.GetAvailableLocalAddress(t) cfg.HTTP.Endpoint = testutil.GetAvailableLocalAddress(t) - creationSet := receivertest.NewNopCreateSettings() + creationSet := receivertest.NewNopSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), creationSet, cfg, consumertest.NewNop()) assert.NotNil(t, tReceiver) assert.NoError(t, err) @@ -125,7 +125,7 @@ func TestCreateTracesReceiver(t *testing.T) { }, } ctx := context.Background() - creationSet := receivertest.NewNopCreateSettings() + creationSet := receivertest.NewNopSettings() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { tr, err := factory.CreateTracesReceiver(ctx, creationSet, tt.cfg, tt.sink) @@ -219,7 +219,7 @@ func TestCreateMetricReceiver(t *testing.T) { }, } ctx := context.Background() - creationSet := receivertest.NewNopCreateSettings() + creationSet := receivertest.NewNopSettings() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { mr, err := factory.CreateMetricsReceiver(ctx, creationSet, tt.cfg, tt.sink) @@ -313,7 +313,7 @@ func TestCreateLogReceiver(t *testing.T) { }, } ctx := context.Background() - creationSet := receivertest.NewNopCreateSettings() + creationSet := receivertest.NewNopSettings() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { mr, err := factory.CreateLogsReceiver(ctx, creationSet, tt.cfg, tt.sink) diff --git a/receiver/otlpreceiver/generated_component_test.go b/receiver/otlpreceiver/generated_component_test.go index 0f54074cff2..6a4de81c668 100644 --- a/receiver/otlpreceiver/generated_component_test.go +++ b/receiver/otlpreceiver/generated_component_test.go @@ -29,26 +29,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "metrics", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "traces", - createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesReceiver(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -63,19 +63,19 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() require.NoError(t, err) require.NoError(t, firstRcvr.Start(context.Background(), host)) require.NoError(t, firstRcvr.Shutdown(context.Background())) - secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondRcvr.Start(context.Background(), host)) require.NoError(t, secondRcvr.Shutdown(context.Background())) diff --git a/receiver/otlpreceiver/internal/logs/otlp_test.go b/receiver/otlpreceiver/internal/logs/otlp_test.go index 645be7e946e..4523f6eb36a 100644 --- a/receiver/otlpreceiver/internal/logs/otlp_test.go +++ b/receiver/otlpreceiver/internal/logs/otlp_test.go @@ -91,7 +91,7 @@ func otlpReceiverOnGRPCServer(t *testing.T, lc consumer.Logs) net.Addr { require.NoError(t, ln.Close()) }) - set := receivertest.NewNopCreateSettings() + set := receivertest.NewNopSettings() set.ID = component.MustNewIDWithName("otlp", "log") obsreport, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: set.ID, diff --git a/receiver/otlpreceiver/internal/metrics/otlp_test.go b/receiver/otlpreceiver/internal/metrics/otlp_test.go index 3a87b34b724..f71be5d17ab 100644 --- a/receiver/otlpreceiver/internal/metrics/otlp_test.go +++ b/receiver/otlpreceiver/internal/metrics/otlp_test.go @@ -92,7 +92,7 @@ func otlpReceiverOnGRPCServer(t *testing.T, mc consumer.Metrics) net.Addr { require.NoError(t, ln.Close()) }) - set := receivertest.NewNopCreateSettings() + set := receivertest.NewNopSettings() set.ID = component.MustNewIDWithName("otlp", "metrics") obsreport, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: set.ID, diff --git a/receiver/otlpreceiver/internal/trace/otlp_test.go b/receiver/otlpreceiver/internal/trace/otlp_test.go index ab538923729..c573471845d 100644 --- a/receiver/otlpreceiver/internal/trace/otlp_test.go +++ b/receiver/otlpreceiver/internal/trace/otlp_test.go @@ -88,7 +88,7 @@ func otlpReceiverOnGRPCServer(t *testing.T, tc consumer.Traces) net.Addr { require.NoError(t, ln.Close()) }) - set := receivertest.NewNopCreateSettings() + set := receivertest.NewNopSettings() set.ID = component.MustNewIDWithName("otlp", "trace") obsreport, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: set.ID, diff --git a/receiver/otlpreceiver/otlp.go b/receiver/otlpreceiver/otlp.go index 43eed9b821a..95d782b880e 100644 --- a/receiver/otlpreceiver/otlp.go +++ b/receiver/otlpreceiver/otlp.go @@ -40,13 +40,13 @@ type otlpReceiver struct { obsrepGRPC *receiverhelper.ObsReport obsrepHTTP *receiverhelper.ObsReport - settings *receiver.CreateSettings + settings *receiver.Settings } // newOtlpReceiver just creates the OpenTelemetry receiver services. It is the caller's // responsibility to invoke the respective Start*Reception methods as well // as the various Stop*Reception methods to end it. -func newOtlpReceiver(cfg *Config, set *receiver.CreateSettings) (*otlpReceiver, error) { +func newOtlpReceiver(cfg *Config, set *receiver.Settings) (*otlpReceiver, error) { r := &otlpReceiver{ cfg: cfg, nextTraces: nil, diff --git a/receiver/otlpreceiver/otlp_test.go b/receiver/otlpreceiver/otlp_test.go index 14eecbcdac1..ef5db33765b 100644 --- a/receiver/otlpreceiver/otlp_test.go +++ b/receiver/otlpreceiver/otlp_test.go @@ -701,7 +701,7 @@ func TestGRPCInvalidTLSCredentials(t *testing.T) { r, err := NewFactory().CreateTracesReceiver( context.Background(), - receivertest.NewNopCreateSettings(), + receivertest.NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) @@ -770,7 +770,7 @@ func TestHTTPInvalidTLSCredentials(t *testing.T) { // TLS is resolved during Start for HTTP. r, err := NewFactory().CreateTracesReceiver( context.Background(), - receivertest.NewNopCreateSettings(), + receivertest.NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) @@ -836,7 +836,7 @@ func newHTTPReceiver(t *testing.T, settings component.TelemetrySettings, endpoin } func newReceiver(t *testing.T, settings component.TelemetrySettings, cfg *Config, id component.ID, c consumertest.Consumer) component.Component { - set := receivertest.NewNopCreateSettings() + set := receivertest.NewNopSettings() set.TelemetrySettings = settings set.ID = id r, err := newOtlpReceiver(cfg, &set) @@ -998,7 +998,7 @@ func TestShutdown(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.GRPC.NetAddr.Endpoint = endpointGrpc cfg.HTTP.Endpoint = endpointHTTP - set := receivertest.NewNopCreateSettings() + set := receivertest.NewNopSettings() set.ID = otlpReceiverID r, err := NewFactory().CreateTracesReceiver( context.Background(), diff --git a/receiver/receiver.go b/receiver/receiver.go index 3b0f0ac8371..3122f6bcd6d 100644 --- a/receiver/receiver.go +++ b/receiver/receiver.go @@ -46,7 +46,12 @@ type Logs interface { } // CreateSettings configures Receiver creators. -type CreateSettings struct { +// +// Deprecated: [v0.103.0] Use receiver.Settings instead. +type CreateSettings = Settings + +// Settings configures Receiver creators. +type Settings struct { // ID returns the ID of the component that will be created. ID component.ID @@ -66,7 +71,7 @@ type Factory interface { // CreateTracesReceiver creates a TracesReceiver based on this config. // If the receiver type does not support tracing or if the config is not valid // an error will be returned instead. `nextConsumer` is never nil. - CreateTracesReceiver(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Traces) (Traces, error) + CreateTracesReceiver(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Traces) (Traces, error) // TracesReceiverStability gets the stability level of the TracesReceiver. TracesReceiverStability() component.StabilityLevel @@ -74,7 +79,7 @@ type Factory interface { // CreateMetricsReceiver creates a MetricsReceiver based on this config. // If the receiver type does not support metrics or if the config is not valid // an error will be returned instead. `nextConsumer` is never nil. - CreateMetricsReceiver(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (Metrics, error) + CreateMetricsReceiver(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Metrics) (Metrics, error) // MetricsReceiverStability gets the stability level of the MetricsReceiver. MetricsReceiverStability() component.StabilityLevel @@ -82,7 +87,7 @@ type Factory interface { // CreateLogsReceiver creates a LogsReceiver based on this config. // If the receiver type does not support the data type or if the config is not valid // an error will be returned instead. `nextConsumer` is never nil. - CreateLogsReceiver(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Logs) (Logs, error) + CreateLogsReceiver(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Logs) (Logs, error) // LogsReceiverStability gets the stability level of the LogsReceiver. LogsReceiverStability() component.StabilityLevel @@ -104,12 +109,12 @@ func (f factoryOptionFunc) applyOption(o *factory) { } // CreateTracesFunc is the equivalent of Factory.CreateTraces. -type CreateTracesFunc func(context.Context, CreateSettings, component.Config, consumer.Traces) (Traces, error) +type CreateTracesFunc func(context.Context, Settings, component.Config, consumer.Traces) (Traces, error) // CreateTracesReceiver implements Factory.CreateTracesReceiver(). func (f CreateTracesFunc) CreateTracesReceiver( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Traces) (Traces, error) { if f == nil { @@ -119,12 +124,12 @@ func (f CreateTracesFunc) CreateTracesReceiver( } // CreateMetricsFunc is the equivalent of Factory.CreateMetrics. -type CreateMetricsFunc func(context.Context, CreateSettings, component.Config, consumer.Metrics) (Metrics, error) +type CreateMetricsFunc func(context.Context, Settings, component.Config, consumer.Metrics) (Metrics, error) // CreateMetricsReceiver implements Factory.CreateMetricsReceiver(). func (f CreateMetricsFunc) CreateMetricsReceiver( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Metrics, ) (Metrics, error) { @@ -135,12 +140,12 @@ func (f CreateMetricsFunc) CreateMetricsReceiver( } // CreateLogsFunc is the equivalent of ReceiverFactory.CreateLogsReceiver(). -type CreateLogsFunc func(context.Context, CreateSettings, component.Config, consumer.Logs) (Logs, error) +type CreateLogsFunc func(context.Context, Settings, component.Config, consumer.Logs) (Logs, error) // CreateLogsReceiver implements Factory.CreateLogsReceiver(). func (f CreateLogsFunc) CreateLogsReceiver( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Logs, ) (Logs, error) { @@ -240,7 +245,7 @@ func NewBuilder(cfgs map[component.ID]component.Config, factories map[component. } // CreateTraces creates a Traces receiver based on the settings and config. -func (b *Builder) CreateTraces(ctx context.Context, set CreateSettings, next consumer.Traces) (Traces, error) { +func (b *Builder) CreateTraces(ctx context.Context, set Settings, next consumer.Traces) (Traces, error) { if next == nil { return nil, errNilNextConsumer } @@ -259,7 +264,7 @@ func (b *Builder) CreateTraces(ctx context.Context, set CreateSettings, next con } // CreateMetrics creates a Metrics receiver based on the settings and config. -func (b *Builder) CreateMetrics(ctx context.Context, set CreateSettings, next consumer.Metrics) (Metrics, error) { +func (b *Builder) CreateMetrics(ctx context.Context, set Settings, next consumer.Metrics) (Metrics, error) { if next == nil { return nil, errNilNextConsumer } @@ -278,7 +283,7 @@ func (b *Builder) CreateMetrics(ctx context.Context, set CreateSettings, next co } // CreateLogs creates a Logs receiver based on the settings and config. -func (b *Builder) CreateLogs(ctx context.Context, set CreateSettings, next consumer.Logs) (Logs, error) { +func (b *Builder) CreateLogs(ctx context.Context, set Settings, next consumer.Logs) (Logs, error) { if next == nil { return nil, errNilNextConsumer } diff --git a/receiver/receiver_test.go b/receiver/receiver_test.go index 00b93dba549..6004d83d3b3 100644 --- a/receiver/receiver_test.go +++ b/receiver/receiver_test.go @@ -24,11 +24,11 @@ func TestNewFactory(t *testing.T) { func() component.Config { return &defaultCfg }) assert.EqualValues(t, testType, factory.Type()) assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) - _, err := factory.CreateTracesReceiver(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err := factory.CreateTracesReceiver(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.Error(t, err) - _, err = factory.CreateMetricsReceiver(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsReceiver(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.Error(t, err) - _, err = factory.CreateLogsReceiver(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsReceiver(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.Error(t, err) } @@ -45,15 +45,15 @@ func TestNewFactoryWithOptions(t *testing.T) { assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) assert.Equal(t, component.StabilityLevelDeprecated, factory.TracesReceiverStability()) - _, err := factory.CreateTracesReceiver(context.Background(), CreateSettings{}, &defaultCfg, nil) + _, err := factory.CreateTracesReceiver(context.Background(), Settings{}, &defaultCfg, nil) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelAlpha, factory.MetricsReceiverStability()) - _, err = factory.CreateMetricsReceiver(context.Background(), CreateSettings{}, &defaultCfg, nil) + _, err = factory.CreateMetricsReceiver(context.Background(), Settings{}, &defaultCfg, nil) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelStable, factory.LogsReceiverStability()) - _, err = factory.CreateLogsReceiver(context.Background(), CreateSettings{}, &defaultCfg, nil) + _, err = factory.CreateLogsReceiver(context.Background(), Settings{}, &defaultCfg, nil) assert.NoError(t, err) } @@ -162,7 +162,7 @@ func TestBuilder(t *testing.T) { cfgs := map[component.ID]component.Config{tt.id: defaultCfg} b := NewBuilder(cfgs, factories) - te, err := b.CreateTraces(context.Background(), createSettings(tt.id), tt.nextTraces) + te, err := b.CreateTraces(context.Background(), settings(tt.id), tt.nextTraces) if tt.err != "" { assert.EqualError(t, err, tt.err) assert.Nil(t, te) @@ -171,7 +171,7 @@ func TestBuilder(t *testing.T) { assert.Equal(t, nopInstance, te) } - me, err := b.CreateMetrics(context.Background(), createSettings(tt.id), tt.nextMetrics) + me, err := b.CreateMetrics(context.Background(), settings(tt.id), tt.nextMetrics) if tt.err != "" { assert.EqualError(t, err, tt.err) assert.Nil(t, me) @@ -180,7 +180,7 @@ func TestBuilder(t *testing.T) { assert.Equal(t, nopInstance, me) } - le, err := b.CreateLogs(context.Background(), createSettings(tt.id), tt.nextLogs) + le, err := b.CreateLogs(context.Background(), settings(tt.id), tt.nextLogs) if tt.err != "" { assert.EqualError(t, err, tt.err) assert.Nil(t, le) @@ -209,15 +209,15 @@ func TestBuilderMissingConfig(t *testing.T) { bErr := NewBuilder(map[component.ID]component.Config{}, factories) missingID := component.MustNewIDWithName("all", "missing") - te, err := bErr.CreateTraces(context.Background(), createSettings(missingID), consumertest.NewNop()) + te, err := bErr.CreateTraces(context.Background(), settings(missingID), consumertest.NewNop()) assert.EqualError(t, err, "receiver \"all/missing\" is not configured") assert.Nil(t, te) - me, err := bErr.CreateMetrics(context.Background(), createSettings(missingID), consumertest.NewNop()) + me, err := bErr.CreateMetrics(context.Background(), settings(missingID), consumertest.NewNop()) assert.EqualError(t, err, "receiver \"all/missing\" is not configured") assert.Nil(t, me) - le, err := bErr.CreateLogs(context.Background(), createSettings(missingID), consumertest.NewNop()) + le, err := bErr.CreateLogs(context.Background(), settings(missingID), consumertest.NewNop()) assert.EqualError(t, err, "receiver \"all/missing\" is not configured") assert.Nil(t, le) } @@ -244,20 +244,20 @@ type nopReceiver struct { consumertest.Consumer } -func createTraces(context.Context, CreateSettings, component.Config, consumer.Traces) (Traces, error) { +func createTraces(context.Context, Settings, component.Config, consumer.Traces) (Traces, error) { return nopInstance, nil } -func createMetrics(context.Context, CreateSettings, component.Config, consumer.Metrics) (Metrics, error) { +func createMetrics(context.Context, Settings, component.Config, consumer.Metrics) (Metrics, error) { return nopInstance, nil } -func createLogs(context.Context, CreateSettings, component.Config, consumer.Logs) (Logs, error) { +func createLogs(context.Context, Settings, component.Config, consumer.Logs) (Logs, error) { return nopInstance, nil } -func createSettings(id component.ID) CreateSettings { - return CreateSettings{ +func settings(id component.ID) Settings { + return Settings{ ID: id, TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), diff --git a/receiver/receiverhelper/generated_component_telemetry_test.go b/receiver/receiverhelper/generated_component_telemetry_test.go index 41d3c0bf81f..e858cbac476 100644 --- a/receiver/receiverhelper/generated_component_telemetry_test.go +++ b/receiver/receiverhelper/generated_component_telemetry_test.go @@ -21,8 +21,8 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -func (tt *componentTestTelemetry) NewCreateSettings() receiver.CreateSettings { - settings := receivertest.NewNopCreateSettings() +func (tt *componentTestTelemetry) NewSettings() receiver.Settings { + settings := receivertest.NewNopSettings() settings.MeterProvider = tt.meterProvider settings.ID = component.NewID(component.MustNewType("receiverhelper")) diff --git a/receiver/receiverhelper/obsreport.go b/receiver/receiverhelper/obsreport.go index 18ff7556454..e5d6fd9b0b7 100644 --- a/receiver/receiverhelper/obsreport.go +++ b/receiver/receiverhelper/obsreport.go @@ -44,7 +44,7 @@ type ObsReportSettings struct { // eg.: a gRPC stream, for which many batches of data are received in individual // operations without a corresponding new context per operation. LongLivedCtx bool - ReceiverCreateSettings receiver.CreateSettings + ReceiverCreateSettings receiver.Settings } // NewObsReport creates a new ObsReport. diff --git a/receiver/receiverhelper/obsreport_test.go b/receiver/receiverhelper/obsreport_test.go index b6d52f9bed0..2400d02672a 100644 --- a/receiver/receiverhelper/obsreport_test.go +++ b/receiver/receiverhelper/obsreport_test.go @@ -48,7 +48,7 @@ func TestReceiveTraceDataOp(t *testing.T) { rec, err := newReceiver(ObsReportSettings{ ReceiverID: receiverID, Transport: transport, - ReceiverCreateSettings: receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ReceiverCreateSettings: receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) ctx := rec.StartTracesOp(parentCtx) @@ -95,7 +95,7 @@ func TestReceiveLogsOp(t *testing.T) { rec, err := newReceiver(ObsReportSettings{ ReceiverID: receiverID, Transport: transport, - ReceiverCreateSettings: receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ReceiverCreateSettings: receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) @@ -143,7 +143,7 @@ func TestReceiveMetricsOp(t *testing.T) { rec, err := newReceiver(ObsReportSettings{ ReceiverID: receiverID, Transport: transport, - ReceiverCreateSettings: receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ReceiverCreateSettings: receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) @@ -198,7 +198,7 @@ func TestReceiveWithLongLivedCtx(t *testing.T) { ReceiverID: receiverID, Transport: transport, LongLivedCtx: true, - ReceiverCreateSettings: receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ReceiverCreateSettings: receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, rerr) ctx := rec.StartTracesOp(longLivedCtx) @@ -241,7 +241,7 @@ func TestCheckReceiverTracesViews(t *testing.T) { rec, err := NewObsReport(ObsReportSettings{ ReceiverID: receiverID, Transport: transport, - ReceiverCreateSettings: receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ReceiverCreateSettings: receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) ctx := rec.StartTracesOp(context.Background()) @@ -262,7 +262,7 @@ func TestCheckReceiverMetricsViews(t *testing.T) { rec, err := NewObsReport(ObsReportSettings{ ReceiverID: receiverID, Transport: transport, - ReceiverCreateSettings: receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ReceiverCreateSettings: receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) ctx := rec.StartMetricsOp(context.Background()) @@ -283,7 +283,7 @@ func TestCheckReceiverLogsViews(t *testing.T) { rec, err := NewObsReport(ObsReportSettings{ ReceiverID: receiverID, Transport: transport, - ReceiverCreateSettings: receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ReceiverCreateSettings: receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) ctx := rec.StartLogsOp(context.Background()) diff --git a/receiver/receivertest/contract_checker.go b/receiver/receivertest/contract_checker.go index 6951b5f41f4..d52e1d3a60f 100644 --- a/receiver/receivertest/contract_checker.go +++ b/receiver/receivertest/contract_checker.go @@ -113,11 +113,11 @@ func checkConsumeContractScenario(params CheckConsumeContractParams, decisionFun var err error switch params.DataType { case component.DataTypeLogs: - receiver, err = params.Factory.CreateLogsReceiver(ctx, NewNopCreateSettings(), params.Config, consumer) + receiver, err = params.Factory.CreateLogsReceiver(ctx, NewNopSettings(), params.Config, consumer) case component.DataTypeTraces: - receiver, err = params.Factory.CreateTracesReceiver(ctx, NewNopCreateSettings(), params.Config, consumer) + receiver, err = params.Factory.CreateTracesReceiver(ctx, NewNopSettings(), params.Config, consumer) case component.DataTypeMetrics: - receiver, err = params.Factory.CreateMetricsReceiver(ctx, NewNopCreateSettings(), params.Config, consumer) + receiver, err = params.Factory.CreateMetricsReceiver(ctx, NewNopSettings(), params.Config, consumer) default: require.FailNow(params.T, "must specify a valid DataType to test for") } diff --git a/receiver/receivertest/contract_checker_test.go b/receiver/receivertest/contract_checker_test.go index 57906308400..9a646dde06f 100644 --- a/receiver/receivertest/contract_checker_test.go +++ b/receiver/receivertest/contract_checker_test.go @@ -203,13 +203,13 @@ func newExampleFactory() receiver.Factory { ) } -func createTrace(_ context.Context, _ receiver.CreateSettings, cfg component.Config, consumer consumer.Traces) (receiver.Traces, error) { +func createTrace(_ context.Context, _ receiver.Settings, cfg component.Config, consumer consumer.Traces) (receiver.Traces, error) { rcv := &exampleReceiver{nextTracesConsumer: consumer} cfg.(*exampleReceiverConfig).generator.(*exampleTraceGenerator).receiver = rcv return rcv, nil } -func createMetric(_ context.Context, _ receiver.CreateSettings, cfg component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { +func createMetric(_ context.Context, _ receiver.Settings, cfg component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { rcv := &exampleReceiver{nextMetricsConsumer: consumer} cfg.(*exampleReceiverConfig).generator.(*exampleMetricGenerator).receiver = rcv return rcv, nil @@ -217,7 +217,7 @@ func createMetric(_ context.Context, _ receiver.CreateSettings, cfg component.Co func createLog( _ context.Context, - _ receiver.CreateSettings, + _ receiver.Settings, cfg component.Config, consumer consumer.Logs, ) (receiver.Logs, error) { diff --git a/receiver/receivertest/nop_receiver.go b/receiver/receivertest/nop_receiver.go index e9cec06ca1b..0b07398a9ee 100644 --- a/receiver/receivertest/nop_receiver.go +++ b/receiver/receivertest/nop_receiver.go @@ -17,8 +17,15 @@ import ( var defaultComponentType = component.MustNewType("nop") // NewNopCreateSettings returns a new nop settings for Create*Receiver functions. -func NewNopCreateSettings() receiver.CreateSettings { - return receiver.CreateSettings{ +// +// Deprecated: [v0.103.0] Use receivertest.NewNopSettings instead. +func NewNopCreateSettings() receiver.Settings { + return NewNopSettings() +} + +// NewNopSettings returns a new nop settings for Create*Receiver functions. +func NewNopSettings() receiver.Settings { + return receiver.Settings{ ID: component.NewIDWithName(defaultComponentType, uuid.NewString()), TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), @@ -56,15 +63,15 @@ func NewNopFactoryForType(dataType component.DataType) receiver.Factory { type nopConfig struct{} -func createTraces(context.Context, receiver.CreateSettings, component.Config, consumer.Traces) (receiver.Traces, error) { +func createTraces(context.Context, receiver.Settings, component.Config, consumer.Traces) (receiver.Traces, error) { return nopInstance, nil } -func createMetrics(context.Context, receiver.CreateSettings, component.Config, consumer.Metrics) (receiver.Metrics, error) { +func createMetrics(context.Context, receiver.Settings, component.Config, consumer.Metrics) (receiver.Metrics, error) { return nopInstance, nil } -func createLogs(context.Context, receiver.CreateSettings, component.Config, consumer.Logs) (receiver.Logs, error) { +func createLogs(context.Context, receiver.Settings, component.Config, consumer.Logs) (receiver.Logs, error) { return nopInstance, nil } diff --git a/receiver/receivertest/nop_receiver_test.go b/receiver/receivertest/nop_receiver_test.go index d384e6b1fb7..345eef005ff 100644 --- a/receiver/receivertest/nop_receiver_test.go +++ b/receiver/receivertest/nop_receiver_test.go @@ -24,17 +24,17 @@ func TestNewNopFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &nopConfig{}, cfg) - traces, err := factory.CreateTracesReceiver(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + traces, err := factory.CreateTracesReceiver(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, traces.Shutdown(context.Background())) - metrics, err := factory.CreateMetricsReceiver(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + metrics, err := factory.CreateMetricsReceiver(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, metrics.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, metrics.Shutdown(context.Background())) - logs, err := factory.CreateLogsReceiver(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + logs, err := factory.CreateLogsReceiver(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, logs.Shutdown(context.Background())) @@ -46,7 +46,7 @@ func TestNewNopBuilder(t *testing.T) { factory := NewNopFactory() cfg := factory.CreateDefaultConfig() - set := NewNopCreateSettings() + set := NewNopSettings() set.ID = component.NewID(nopType) traces, err := factory.CreateTracesReceiver(context.Background(), set, cfg, consumertest.NewNop()) diff --git a/receiver/scraperhelper/generated_component_telemetry_test.go b/receiver/scraperhelper/generated_component_telemetry_test.go index 7eeed50b953..d0e9d175ff9 100644 --- a/receiver/scraperhelper/generated_component_telemetry_test.go +++ b/receiver/scraperhelper/generated_component_telemetry_test.go @@ -21,8 +21,8 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -func (tt *componentTestTelemetry) NewCreateSettings() receiver.CreateSettings { - settings := receivertest.NewNopCreateSettings() +func (tt *componentTestTelemetry) NewSettings() receiver.Settings { + settings := receivertest.NewNopSettings() settings.MeterProvider = tt.meterProvider settings.ID = component.NewID(component.MustNewType("scraperhelper")) diff --git a/receiver/scraperhelper/obsreport.go b/receiver/scraperhelper/obsreport.go index 9c10f7002a8..c7cb1b1dbeb 100644 --- a/receiver/scraperhelper/obsreport.go +++ b/receiver/scraperhelper/obsreport.go @@ -38,7 +38,7 @@ type ObsReport struct { type ObsReportSettings struct { ReceiverID component.ID Scraper component.ID - ReceiverCreateSettings receiver.CreateSettings + ReceiverCreateSettings receiver.Settings } // NewObsReport creates a new ObsReport. diff --git a/receiver/scraperhelper/obsreport_test.go b/receiver/scraperhelper/obsreport_test.go index 5e807962f0d..94d58f18d97 100644 --- a/receiver/scraperhelper/obsreport_test.go +++ b/receiver/scraperhelper/obsreport_test.go @@ -47,7 +47,7 @@ func TestScrapeMetricsDataOp(t *testing.T) { scrp, err := newScraper(ObsReportSettings{ ReceiverID: receiverID, Scraper: scraperID, - ReceiverCreateSettings: receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ReceiverCreateSettings: receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) ctx := scrp.StartMetricsOp(parentCtx) @@ -98,7 +98,7 @@ func TestCheckScraperMetricsViews(t *testing.T) { s, err := NewObsReport(ObsReportSettings{ ReceiverID: receiverID, Scraper: scraperID, - ReceiverCreateSettings: receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ReceiverCreateSettings: receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) ctx := s.StartMetricsOp(context.Background()) diff --git a/receiver/scraperhelper/scrapercontroller.go b/receiver/scraperhelper/scrapercontroller.go index eb13ee66cc4..eed33fd2193 100644 --- a/receiver/scraperhelper/scrapercontroller.go +++ b/receiver/scraperhelper/scrapercontroller.go @@ -60,13 +60,13 @@ type controller struct { terminated chan struct{} obsrecv *receiverhelper.ObsReport - recvSettings receiver.CreateSettings + recvSettings receiver.Settings } // NewScraperControllerReceiver creates a Receiver with the configured options, that can control multiple scrapers. func NewScraperControllerReceiver( cfg *ControllerConfig, - set receiver.CreateSettings, + set receiver.Settings, nextConsumer consumer.Metrics, options ...ScraperControllerOption, ) (component.Component, error) { diff --git a/receiver/scraperhelper/scrapercontroller_test.go b/receiver/scraperhelper/scrapercontroller_test.go index 1c41258ff18..f056a7eb8d2 100644 --- a/receiver/scraperhelper/scrapercontroller_test.go +++ b/receiver/scraperhelper/scrapercontroller_test.go @@ -145,7 +145,7 @@ func TestScrapeController(t *testing.T) { cfg = test.scraperControllerSettings } - mr, err := NewScraperControllerReceiver(cfg, receiver.CreateSettings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, sink, options...) + mr, err := NewScraperControllerReceiver(cfg, receiver.Settings{ID: receiverID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, sink, options...) if test.expectedNewErr != "" { assert.EqualError(t, err, test.expectedNewErr) return @@ -330,7 +330,7 @@ func TestSingleScrapePerInterval(t *testing.T) { receiver, err := NewScraperControllerReceiver( cfg, - receivertest.NewNopCreateSettings(), + receivertest.NewNopSettings(), new(consumertest.MetricsSink), AddScraper(scp), WithTickerChannel(tickerCh), @@ -375,7 +375,7 @@ func TestScrapeControllerStartsOnInit(t *testing.T) { CollectionInterval: time.Hour, InitialDelay: 0, }, - receivertest.NewNopCreateSettings(), + receivertest.NewNopSettings(), new(consumertest.MetricsSink), AddScraper(scp), ) @@ -411,7 +411,7 @@ func TestScrapeControllerInitialDelay(t *testing.T) { r, err := NewScraperControllerReceiver( &cfg, - receivertest.NewNopCreateSettings(), + receivertest.NewNopSettings(), new(consumertest.MetricsSink), AddScraper(scp), ) diff --git a/service/internal/graph/graph_test.go b/service/internal/graph/graph_test.go index 343f752b888..c93a0db5771 100644 --- a/service/internal/graph/graph_test.go +++ b/service/internal/graph/graph_test.go @@ -2456,13 +2456,13 @@ func newBadConnectorFactory() connector.Factory { func newErrReceiverFactory() receiver.Factory { return receiver.NewFactory(component.MustNewType("err"), func() component.Config { return &struct{}{} }, - receiver.WithTraces(func(context.Context, receiver.CreateSettings, component.Config, consumer.Traces) (receiver.Traces, error) { + receiver.WithTraces(func(context.Context, receiver.Settings, component.Config, consumer.Traces) (receiver.Traces, error) { return &errComponent{}, nil }, component.StabilityLevelUndefined), - receiver.WithLogs(func(context.Context, receiver.CreateSettings, component.Config, consumer.Logs) (receiver.Logs, error) { + receiver.WithLogs(func(context.Context, receiver.Settings, component.Config, consumer.Logs) (receiver.Logs, error) { return &errComponent{}, nil }, component.StabilityLevelUndefined), - receiver.WithMetrics(func(context.Context, receiver.CreateSettings, component.Config, consumer.Metrics) (receiver.Metrics, error) { + receiver.WithMetrics(func(context.Context, receiver.Settings, component.Config, consumer.Metrics) (receiver.Metrics, error) { return &errComponent{}, nil }, component.StabilityLevelUndefined), ) diff --git a/service/internal/graph/nodes.go b/service/internal/graph/nodes.go index 238bbf3b287..757e52c09bc 100644 --- a/service/internal/graph/nodes.go +++ b/service/internal/graph/nodes.go @@ -73,7 +73,7 @@ func (n *receiverNode) buildComponent(ctx context.Context, builder *receiver.Builder, nexts []baseConsumer, ) error { - set := receiver.CreateSettings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info} + set := receiver.Settings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info} set.TelemetrySettings.Logger = components.ReceiverLogger(tel.Logger, n.componentID, n.pipelineType) var err error switch n.pipelineType { diff --git a/service/internal/testcomponents/example_receiver.go b/service/internal/testcomponents/example_receiver.go index 34b0372b03b..b1287babc58 100644 --- a/service/internal/testcomponents/example_receiver.go +++ b/service/internal/testcomponents/example_receiver.go @@ -28,7 +28,7 @@ func createReceiverDefaultConfig() component.Config { // createTracesReceiver creates a trace receiver based on this config. func createTracesReceiver( _ context.Context, - _ receiver.CreateSettings, + _ receiver.Settings, cfg component.Config, nextConsumer consumer.Traces, ) (receiver.Traces, error) { @@ -40,7 +40,7 @@ func createTracesReceiver( // createMetricsReceiver creates a metrics receiver based on this config. func createMetricsReceiver( _ context.Context, - _ receiver.CreateSettings, + _ receiver.Settings, cfg component.Config, nextConsumer consumer.Metrics, ) (receiver.Metrics, error) { @@ -51,7 +51,7 @@ func createMetricsReceiver( func createLogsReceiver( _ context.Context, - _ receiver.CreateSettings, + _ receiver.Settings, cfg component.Config, nextConsumer consumer.Logs, ) (receiver.Logs, error) { From 9c3481b0a3a2fb6125496f3de31eb2a82e370e7e Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Wed, 5 Jun 2024 16:42:26 -0700 Subject: [PATCH 038/168] [exporterhelper] Fix potential deadlock in the batch sender (#10315) Concurrent handling of the flush timeouts can run into a deadlock when a batch is simultaneously sent by reaching the minimum size and flush timeout. The deadlock can happen on the following lines: - https://github.com/open-telemetry/opentelemetry-collector/blob/115bc8e28e009ca93565dc4deb4cf6608fa63622/exporter/exporterhelper/batch_sender.go#L131 - https://github.com/open-telemetry/opentelemetry-collector/blob/115bc8e28e009ca93565dc4deb4cf6608fa63622/exporter/exporterhelper/batch_sender.go#L87 Co-authored-by: Carson Ip --- .../batchseder-fix-potential-deadlock.yaml | 19 +++++ exporter/exporterhelper/batch_sender.go | 28 +++--- exporter/exporterhelper/batch_sender_test.go | 85 +++++++++++++++++++ 3 files changed, 114 insertions(+), 18 deletions(-) create mode 100644 .chloggen/batchseder-fix-potential-deadlock.yaml diff --git a/.chloggen/batchseder-fix-potential-deadlock.yaml b/.chloggen/batchseder-fix-potential-deadlock.yaml new file mode 100644 index 00000000000..d3b89737775 --- /dev/null +++ b/.chloggen/batchseder-fix-potential-deadlock.yaml @@ -0,0 +1,19 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix potential deadlock in the batch sender + +# One or more tracking issues or pull requests related to the change +issues: [10315] + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +change_logs: [user] diff --git a/exporter/exporterhelper/batch_sender.go b/exporter/exporterhelper/batch_sender.go index 8c69c4c1f61..3501fc3efb0 100644 --- a/exporter/exporterhelper/batch_sender.go +++ b/exporter/exporterhelper/batch_sender.go @@ -33,10 +33,9 @@ type batchSender struct { concurrencyLimit uint64 activeRequests atomic.Uint64 - resetTimerCh chan struct{} - mu sync.Mutex activeBatch *batch + lastFlushed time.Time logger *zap.Logger @@ -57,7 +56,6 @@ func newBatchSender(cfg exporterbatcher.Config, set exporter.CreateSettings, shutdownCh: nil, shutdownCompleteCh: make(chan struct{}), stopped: &atomic.Bool{}, - resetTimerCh: make(chan struct{}), } return bs } @@ -85,16 +83,17 @@ func (bs *batchSender) Start(_ context.Context, _ component.Host) error { return case <-timer.C: bs.mu.Lock() + nextFlush := bs.cfg.FlushTimeout if bs.activeBatch.request != nil { - bs.exportActiveBatch() + sinceLastFlush := time.Since(bs.lastFlushed) + if sinceLastFlush >= bs.cfg.FlushTimeout { + bs.exportActiveBatch() + } else { + nextFlush = bs.cfg.FlushTimeout - sinceLastFlush + } } bs.mu.Unlock() - timer.Reset(bs.cfg.FlushTimeout) - case <-bs.resetTimerCh: - if !timer.Stop() { - <-timer.C - } - timer.Reset(bs.cfg.FlushTimeout) + timer.Reset(nextFlush) } } }() @@ -123,15 +122,10 @@ func (bs *batchSender) exportActiveBatch() { b.err = bs.nextSender.send(b.ctx, b.request) close(b.done) }(bs.activeBatch) + bs.lastFlushed = time.Now() bs.activeBatch = newEmptyBatch() } -func (bs *batchSender) resetTimer() { - if !bs.stopped.Load() { - bs.resetTimerCh <- struct{}{} - } -} - // isActiveBatchReady returns true if the active batch is ready to be exported. // The batch is ready if it has reached the minimum size or the concurrency limit is reached. // Caller must hold the lock. @@ -168,7 +162,6 @@ func (bs *batchSender) sendMergeSplitBatch(ctx context.Context, req Request) err batch := bs.activeBatch if bs.isActiveBatchReady() || len(reqs) > 1 { bs.exportActiveBatch() - bs.resetTimer() } bs.mu.Unlock() <-batch.done @@ -208,7 +201,6 @@ func (bs *batchSender) sendMergeBatch(ctx context.Context, req Request) error { batch := bs.activeBatch if bs.isActiveBatchReady() { bs.exportActiveBatch() - bs.resetTimer() } bs.mu.Unlock() <-batch.done diff --git a/exporter/exporterhelper/batch_sender_test.go b/exporter/exporterhelper/batch_sender_test.go index cfcef01711c..5a5a175bdab 100644 --- a/exporter/exporterhelper/batch_sender_test.go +++ b/exporter/exporterhelper/batch_sender_test.go @@ -535,6 +535,91 @@ func TestBatchSenderWithTimeout(t *testing.T) { assert.EqualValues(t, 12, sink.itemsCount.Load()) } +func TestBatchSenderTimerResetNoConflict(t *testing.T) { + delayBatchMergeFunc := func(_ context.Context, r1 Request, r2 Request) (Request, error) { + time.Sleep(30 * time.Millisecond) + if r1 == nil { + return r2, nil + } + fr1 := r1.(*fakeRequest) + fr2 := r2.(*fakeRequest) + if fr2.mergeErr != nil { + return nil, fr2.mergeErr + } + return &fakeRequest{ + items: fr1.items + fr2.items, + sink: fr1.sink, + exportErr: fr2.exportErr, + delay: fr1.delay + fr2.delay, + }, nil + } + bCfg := exporterbatcher.NewDefaultConfig() + bCfg.MinSizeItems = 8 + bCfg.FlushTimeout = 50 * time.Millisecond + be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, + WithBatcher(bCfg, WithRequestBatchFuncs(delayBatchMergeFunc, fakeBatchMergeSplitFunc))) + require.NoError(t, err) + require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost())) + sink := newFakeRequestSink() + + // Send 2 concurrent requests that should be merged in one batch in the same interval as the flush timer + go func() { + require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) + }() + time.Sleep(30 * time.Millisecond) + go func() { + require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) + }() + + // The batch should be sent either with the flush interval or by reaching the minimum items size with no conflict + assert.EventuallyWithT(t, func(c *assert.CollectT) { + assert.LessOrEqual(c, uint64(1), sink.requestsCount.Load()) + assert.EqualValues(c, 8, sink.itemsCount.Load()) + }, 200*time.Millisecond, 10*time.Millisecond) + + require.NoError(t, be.Shutdown(context.Background())) +} + +func TestBatchSenderTimerFlush(t *testing.T) { + bCfg := exporterbatcher.NewDefaultConfig() + bCfg.MinSizeItems = 8 + bCfg.FlushTimeout = 100 * time.Millisecond + be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, + WithBatcher(bCfg, WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc))) + require.NoError(t, err) + require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost())) + sink := newFakeRequestSink() + time.Sleep(50 * time.Millisecond) + + // Send 2 concurrent requests that should be merged in one batch and sent immediately + go func() { + require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) + }() + go func() { + require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) + }() + assert.EventuallyWithT(t, func(c *assert.CollectT) { + assert.LessOrEqual(c, uint64(1), sink.requestsCount.Load()) + assert.EqualValues(c, 8, sink.itemsCount.Load()) + }, 30*time.Millisecond, 5*time.Millisecond) + + // Send another request that should be flushed after 100ms instead of 50ms since last flush + go func() { + require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) + }() + + // Confirm that it is not flushed in 50ms + time.Sleep(60 * time.Millisecond) + assert.LessOrEqual(t, uint64(1), sink.requestsCount.Load()) + assert.EqualValues(t, 8, sink.itemsCount.Load()) + + // Confirm that it is flushed after 100ms (using 60+50=110 here to be safe) + time.Sleep(50 * time.Millisecond) + assert.LessOrEqual(t, uint64(2), sink.requestsCount.Load()) + assert.EqualValues(t, 12, sink.itemsCount.Load()) + require.NoError(t, be.Shutdown(context.Background())) +} + func queueBatchExporter(t *testing.T, batchOption Option) *baseExporter { be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, batchOption, WithRequestQueue(exporterqueue.NewDefaultConfig(), exporterqueue.NewMemoryQueueFactory[Request]())) From d3c5ce06e79dada28a63a8f2a6d2d41237947b89 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 6 Jun 2024 14:36:37 +0000 Subject: [PATCH 039/168] [chore] Clarify that cmd/otelcorecol and top-level go.mod are not the source of the core distro (#10351) #### Description Documents the purpose of `cmd/otelcorecol` in a new README and in a comment on the builder manifest. Adds note to top-level go.mod. This is a common point of confusion and was recently confusing for users on the aftermath of CVE-2024-36129 Counterpart to open-telemetry/opentelemetry-collector-contrib/pull/33409 --------- Co-authored-by: Armin Ruech <7052238+arminru@users.noreply.github.com> --- cmd/otelcorecol/README.md | 4 ++++ cmd/otelcorecol/builder-config.yaml | 8 ++++++++ go.mod | 8 ++++++++ 3 files changed, 20 insertions(+) create mode 100644 cmd/otelcorecol/README.md diff --git a/cmd/otelcorecol/README.md b/cmd/otelcorecol/README.md new file mode 100644 index 00000000000..f79604734fa --- /dev/null +++ b/cmd/otelcorecol/README.md @@ -0,0 +1,4 @@ +# `otelcorecol` test binary + +This folder contains the sources for the `otelcorecol` test binary. This binary is intended for internal **TEST PURPOSES ONLY**. The source files in this folder are **NOT** the ones used to build any official OpenTelemetry Collector releases. +Check [open-telemetry/opentelemetry-collector-releases](https://github.com/open-telemetry/opentelemetry-collector-releases) for the official releases. Check the [**`otelcol` folder**](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol) on that repository for the official Collector core manifest. diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 2a1390befe3..a5fd63d4597 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -1,3 +1,11 @@ +# NOTE: +# This builder configuration is NOT used to build any official binary. +# To see the builder manifests used for official binaries, +# check https://github.com/open-telemetry/opentelemetry-collector-releases +# +# For the OpenTelemetry Collector Core official distribution sources, check +# https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol + dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol diff --git a/go.mod b/go.mod index ac030871ca7..b4c6bab7f18 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,13 @@ module go.opentelemetry.io/collector +// NOTE: +// This go.mod is NOT used to build any official binary. +// To see the builder manifests used for official binaries, +// check https://github.com/open-telemetry/opentelemetry-collector-releases +// +// For the OpenTelemetry Collector Core distribution specifically, see +// https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol + go 1.21.0 require ( From f0c8787d2ba8a26b489e657c9d7016daa01ba677 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 6 Jun 2024 08:03:40 -0700 Subject: [PATCH 040/168] [exporter] deprecate CreateSettings -> Settings (#10335) This deprecates CreateSettings in favour of Settings. NewNopCreateSettings is also being deprecated in favour of NewNopSettings Part of #9428 ~Follows https://github.com/open-telemetry/opentelemetry-collector/pull/10333~ --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_create-settings-exporter.yaml | 28 ++++++++++ .../component_telemetry_test.go.tmpl | 2 +- cmd/mdatagen/templates/component_test.go.tmpl | 12 ++--- exporter/debugexporter/exporter_test.go | 6 +-- exporter/debugexporter/factory.go | 6 +-- exporter/debugexporter/factory_test.go | 6 +-- .../debugexporter/generated_component_test.go | 12 ++--- exporter/exporter.go | 33 +++++++----- exporter/exporter_test.go | 22 ++++---- exporter/exporterhelper/batch_sender.go | 2 +- exporter/exporterhelper/common.go | 4 +- exporter/exporterhelper/common_test.go | 12 ++--- .../generated_component_telemetry_test.go | 4 +- exporter/exporterhelper/logs.go | 4 +- exporter/exporterhelper/logs_test.go | 52 +++++++++---------- exporter/exporterhelper/metrics.go | 4 +- exporter/exporterhelper/metrics_test.go | 52 +++++++++---------- exporter/exporterhelper/obsexporter.go | 2 +- exporter/exporterhelper/obsexporter_test.go | 12 ++--- exporter/exporterhelper/obsreport_test.go | 2 +- exporter/exporterhelper/queue_sender.go | 2 +- exporter/exporterhelper/queue_sender_test.go | 16 +++--- exporter/exporterhelper/retry_sender.go | 2 +- exporter/exporterhelper/retry_sender_test.go | 4 +- exporter/exporterhelper/traces.go | 4 +- exporter/exporterhelper/traces_test.go | 52 +++++++++---------- exporter/exporterqueue/queue.go | 2 +- exporter/exportertest/contract_checker.go | 6 +-- .../exportertest/contract_checker_test.go | 6 +-- exporter/exportertest/nop_exporter.go | 17 ++++-- exporter/exportertest/nop_exporter_test.go | 8 +-- exporter/internal/common/factory.go | 6 +-- exporter/internal/common/factory_test.go | 6 +-- .../internal/common/logging_exporter_test.go | 6 +-- exporter/internal/queue/persistent_queue.go | 2 +- .../internal/queue/persistent_queue_test.go | 6 +-- exporter/loggingexporter/factory.go | 6 +-- exporter/loggingexporter/factory_test.go | 6 +-- .../generated_component_test.go | 12 ++--- .../nopexporter/generated_component_test.go | 12 ++--- exporter/nopexporter/nop_exporter.go | 6 +-- exporter/nopexporter/nop_exporter_test.go | 6 +-- exporter/otlpexporter/factory.go | 6 +-- exporter/otlpexporter/factory_test.go | 6 +-- .../otlpexporter/generated_component_test.go | 12 ++--- exporter/otlpexporter/otlp.go | 2 +- exporter/otlpexporter/otlp_test.go | 14 ++--- exporter/otlphttpexporter/factory.go | 6 +-- exporter/otlphttpexporter/factory_test.go | 6 +-- .../generated_component_test.go | 12 ++--- exporter/otlphttpexporter/otlp.go | 2 +- exporter/otlphttpexporter/otlp_test.go | 28 +++++----- internal/e2e/otlphttp_test.go | 8 +-- service/internal/graph/graph_test.go | 6 +-- service/internal/graph/nodes.go | 2 +- .../testcomponents/example_exporter.go | 6 +-- 56 files changed, 313 insertions(+), 273 deletions(-) create mode 100644 .chloggen/codeboten_create-settings-exporter.yaml diff --git a/.chloggen/codeboten_create-settings-exporter.yaml b/.chloggen/codeboten_create-settings-exporter.yaml new file mode 100644 index 00000000000..7d444e36b09 --- /dev/null +++ b/.chloggen/codeboten_create-settings-exporter.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate CreateSettings and NewNopCreateSettings + +# One or more tracking issues or pull requests related to the change +issues: [9428] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The following methods are being renamed: + - exporter.CreateSettings -> exporter.Settings + - exporter.NewNopCreateSettings -> exporter.NewNopSettings + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl index 03a702acd00..3c3f06140fa 100644 --- a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl +++ b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl @@ -21,7 +21,7 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -{{- if isReceiver }} +{{- if (or isExporter isReceiver) }} func (tt *componentTestTelemetry) NewSettings() {{ .Status.Class }}.Settings { settings := {{ .Status.Class }}test.NewNopSettings() settings.MeterProvider = tt.meterProvider diff --git a/cmd/mdatagen/templates/component_test.go.tmpl b/cmd/mdatagen/templates/component_test.go.tmpl index fe6a1786936..767d9acfacc 100644 --- a/cmd/mdatagen/templates/component_test.go.tmpl +++ b/cmd/mdatagen/templates/component_test.go.tmpl @@ -69,12 +69,12 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct{ name string - createFn func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) }{ {{ if supportsLogs }} { name: "logs", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsExporter(ctx, set, cfg) }, }, @@ -82,7 +82,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsMetrics }} { name: "metrics", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsExporter(ctx, set, cfg) }, }, @@ -90,7 +90,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsTraces }} { name: "traces", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesExporter(ctx, set, cfg) }, }, @@ -107,7 +107,7 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { {{- if not .Tests.SkipShutdown }} t.Run(test.name + "-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) @@ -116,7 +116,7 @@ func TestComponentLifecycle(t *testing.T) { {{- if not .Tests.SkipLifecycle }} t.Run(test.name + "-lifecycle", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() err = c.Start(context.Background(), host) diff --git a/exporter/debugexporter/exporter_test.go b/exporter/debugexporter/exporter_test.go index 5e4c01ee539..4a435339c6f 100644 --- a/exporter/debugexporter/exporter_test.go +++ b/exporter/debugexporter/exporter_test.go @@ -21,7 +21,7 @@ import ( ) func TestTracesExporterNoErrors(t *testing.T) { - lte, err := createTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), createDefaultConfig()) + lte, err := createTracesExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig()) require.NotNil(t, lte) assert.NoError(t, err) @@ -32,7 +32,7 @@ func TestTracesExporterNoErrors(t *testing.T) { } func TestMetricsExporterNoErrors(t *testing.T) { - lme, err := createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), createDefaultConfig()) + lme, err := createMetricsExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig()) require.NotNil(t, lme) assert.NoError(t, err) @@ -46,7 +46,7 @@ func TestMetricsExporterNoErrors(t *testing.T) { } func TestLogsExporterNoErrors(t *testing.T) { - lle, err := createLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), createDefaultConfig()) + lle, err := createLogsExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig()) require.NotNil(t, lle) assert.NoError(t, err) diff --git a/exporter/debugexporter/factory.go b/exporter/debugexporter/factory.go index b91b1950f7e..5a61da417dc 100644 --- a/exporter/debugexporter/factory.go +++ b/exporter/debugexporter/factory.go @@ -46,7 +46,7 @@ func createDefaultConfig() component.Config { } } -func createTracesExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Traces, error) { +func createTracesExporter(ctx context.Context, set exporter.Settings, config component.Config) (exporter.Traces, error) { cfg := config.(*Config) exporterLogger := createLogger(cfg, set.TelemetrySettings.Logger) debugExporter := newDebugExporter(exporterLogger, cfg.Verbosity) @@ -58,7 +58,7 @@ func createTracesExporter(ctx context.Context, set exporter.CreateSettings, conf ) } -func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Metrics, error) { +func createMetricsExporter(ctx context.Context, set exporter.Settings, config component.Config) (exporter.Metrics, error) { cfg := config.(*Config) exporterLogger := createLogger(cfg, set.TelemetrySettings.Logger) debugExporter := newDebugExporter(exporterLogger, cfg.Verbosity) @@ -70,7 +70,7 @@ func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, con ) } -func createLogsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Logs, error) { +func createLogsExporter(ctx context.Context, set exporter.Settings, config component.Config) (exporter.Logs, error) { cfg := config.(*Config) exporterLogger := createLogger(cfg, set.TelemetrySettings.Logger) debugExporter := newDebugExporter(exporterLogger, cfg.Verbosity) diff --git a/exporter/debugexporter/factory_test.go b/exporter/debugexporter/factory_test.go index b4c35a2200c..df16570e48e 100644 --- a/exporter/debugexporter/factory_test.go +++ b/exporter/debugexporter/factory_test.go @@ -24,7 +24,7 @@ func TestCreateMetricsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - me, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + me, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, me) } @@ -33,7 +33,7 @@ func TestCreateTracesExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - te, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + te, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, te) } @@ -42,7 +42,7 @@ func TestCreateLogsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - te, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + te, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, te) } diff --git a/exporter/debugexporter/generated_component_test.go b/exporter/debugexporter/generated_component_test.go index 3ae3f1c3607..b4c5d25ec7d 100644 --- a/exporter/debugexporter/generated_component_test.go +++ b/exporter/debugexporter/generated_component_test.go @@ -33,26 +33,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsExporter(ctx, set, cfg) }, }, { name: "metrics", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsExporter(ctx, set, cfg) }, }, { name: "traces", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesExporter(ctx, set, cfg) }, }, @@ -67,13 +67,13 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() err = c.Start(context.Background(), host) diff --git a/exporter/exporter.go b/exporter/exporter.go index 818fa3ecac3..d78e952dd7a 100644 --- a/exporter/exporter.go +++ b/exporter/exporter.go @@ -31,8 +31,13 @@ type Logs interface { consumer.Logs } -// CreateSettings configures exporter creators. -type CreateSettings struct { +// CreateSettings configures Exporter creators. +// +// Deprecated: [v0.103.0] Use exporter.Settings instead. +type CreateSettings = Settings + +// Settings configures exporter creators. +type Settings struct { // ID returns the ID of the component that will be created. ID component.ID @@ -52,7 +57,7 @@ type Factory interface { // CreateTracesExporter creates a TracesExporter based on this config. // If the exporter type does not support tracing or if the config is not valid, // an error will be returned instead. - CreateTracesExporter(ctx context.Context, set CreateSettings, cfg component.Config) (Traces, error) + CreateTracesExporter(ctx context.Context, set Settings, cfg component.Config) (Traces, error) // TracesExporterStability gets the stability level of the TracesExporter. TracesExporterStability() component.StabilityLevel @@ -60,7 +65,7 @@ type Factory interface { // CreateMetricsExporter creates a MetricsExporter based on this config. // If the exporter type does not support metrics or if the config is not valid, // an error will be returned instead. - CreateMetricsExporter(ctx context.Context, set CreateSettings, cfg component.Config) (Metrics, error) + CreateMetricsExporter(ctx context.Context, set Settings, cfg component.Config) (Metrics, error) // MetricsExporterStability gets the stability level of the MetricsExporter. MetricsExporterStability() component.StabilityLevel @@ -68,7 +73,7 @@ type Factory interface { // CreateLogsExporter creates a LogsExporter based on the config. // If the exporter type does not support logs or if the config is not valid, // an error will be returned instead. - CreateLogsExporter(ctx context.Context, set CreateSettings, cfg component.Config) (Logs, error) + CreateLogsExporter(ctx context.Context, set Settings, cfg component.Config) (Logs, error) // LogsExporterStability gets the stability level of the LogsExporter. LogsExporterStability() component.StabilityLevel @@ -92,10 +97,10 @@ func (f factoryOptionFunc) applyExporterFactoryOption(o *factory) { } // CreateTracesFunc is the equivalent of Factory.CreateTraces. -type CreateTracesFunc func(context.Context, CreateSettings, component.Config) (Traces, error) +type CreateTracesFunc func(context.Context, Settings, component.Config) (Traces, error) // CreateTracesExporter implements ExporterFactory.CreateTracesExporter(). -func (f CreateTracesFunc) CreateTracesExporter(ctx context.Context, set CreateSettings, cfg component.Config) (Traces, error) { +func (f CreateTracesFunc) CreateTracesExporter(ctx context.Context, set Settings, cfg component.Config) (Traces, error) { if f == nil { return nil, component.ErrDataTypeIsNotSupported } @@ -103,10 +108,10 @@ func (f CreateTracesFunc) CreateTracesExporter(ctx context.Context, set CreateSe } // CreateMetricsFunc is the equivalent of Factory.CreateMetrics. -type CreateMetricsFunc func(context.Context, CreateSettings, component.Config) (Metrics, error) +type CreateMetricsFunc func(context.Context, Settings, component.Config) (Metrics, error) // CreateMetricsExporter implements ExporterFactory.CreateMetricsExporter(). -func (f CreateMetricsFunc) CreateMetricsExporter(ctx context.Context, set CreateSettings, cfg component.Config) (Metrics, error) { +func (f CreateMetricsFunc) CreateMetricsExporter(ctx context.Context, set Settings, cfg component.Config) (Metrics, error) { if f == nil { return nil, component.ErrDataTypeIsNotSupported } @@ -114,10 +119,10 @@ func (f CreateMetricsFunc) CreateMetricsExporter(ctx context.Context, set Create } // CreateLogsFunc is the equivalent of Factory.CreateLogs. -type CreateLogsFunc func(context.Context, CreateSettings, component.Config) (Logs, error) +type CreateLogsFunc func(context.Context, Settings, component.Config) (Logs, error) // CreateLogsExporter implements Factory.CreateLogsExporter(). -func (f CreateLogsFunc) CreateLogsExporter(ctx context.Context, set CreateSettings, cfg component.Config) (Logs, error) { +func (f CreateLogsFunc) CreateLogsExporter(ctx context.Context, set Settings, cfg component.Config) (Logs, error) { if f == nil { return nil, component.ErrDataTypeIsNotSupported } @@ -214,7 +219,7 @@ func NewBuilder(cfgs map[component.ID]component.Config, factories map[component. } // CreateTraces creates a Traces exporter based on the settings and config. -func (b *Builder) CreateTraces(ctx context.Context, set CreateSettings) (Traces, error) { +func (b *Builder) CreateTraces(ctx context.Context, set Settings) (Traces, error) { cfg, existsCfg := b.cfgs[set.ID] if !existsCfg { return nil, fmt.Errorf("exporter %q is not configured", set.ID) @@ -230,7 +235,7 @@ func (b *Builder) CreateTraces(ctx context.Context, set CreateSettings) (Traces, } // CreateMetrics creates a Metrics exporter based on the settings and config. -func (b *Builder) CreateMetrics(ctx context.Context, set CreateSettings) (Metrics, error) { +func (b *Builder) CreateMetrics(ctx context.Context, set Settings) (Metrics, error) { cfg, existsCfg := b.cfgs[set.ID] if !existsCfg { return nil, fmt.Errorf("exporter %q is not configured", set.ID) @@ -246,7 +251,7 @@ func (b *Builder) CreateMetrics(ctx context.Context, set CreateSettings) (Metric } // CreateLogs creates a Logs exporter based on the settings and config. -func (b *Builder) CreateLogs(ctx context.Context, set CreateSettings) (Logs, error) { +func (b *Builder) CreateLogs(ctx context.Context, set Settings) (Logs, error) { cfg, existsCfg := b.cfgs[set.ID] if !existsCfg { return nil, fmt.Errorf("exporter %q is not configured", set.ID) diff --git a/exporter/exporter_test.go b/exporter/exporter_test.go index 108e55fb582..61840ff17f3 100644 --- a/exporter/exporter_test.go +++ b/exporter/exporter_test.go @@ -23,11 +23,11 @@ func TestNewFactory(t *testing.T) { func() component.Config { return &defaultCfg }) assert.EqualValues(t, testType, factory.Type()) assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) - _, err := factory.CreateTracesExporter(context.Background(), CreateSettings{}, &defaultCfg) + _, err := factory.CreateTracesExporter(context.Background(), Settings{}, &defaultCfg) assert.Error(t, err) - _, err = factory.CreateMetricsExporter(context.Background(), CreateSettings{}, &defaultCfg) + _, err = factory.CreateMetricsExporter(context.Background(), Settings{}, &defaultCfg) assert.Error(t, err) - _, err = factory.CreateLogsExporter(context.Background(), CreateSettings{}, &defaultCfg) + _, err = factory.CreateLogsExporter(context.Background(), Settings{}, &defaultCfg) assert.Error(t, err) } @@ -44,15 +44,15 @@ func TestNewFactoryWithOptions(t *testing.T) { assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) assert.Equal(t, component.StabilityLevelDevelopment, factory.TracesExporterStability()) - _, err := factory.CreateTracesExporter(context.Background(), CreateSettings{}, &defaultCfg) + _, err := factory.CreateTracesExporter(context.Background(), Settings{}, &defaultCfg) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelAlpha, factory.MetricsExporterStability()) - _, err = factory.CreateMetricsExporter(context.Background(), CreateSettings{}, &defaultCfg) + _, err = factory.CreateMetricsExporter(context.Background(), Settings{}, &defaultCfg) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelDeprecated, factory.LogsExporterStability()) - _, err = factory.CreateLogsExporter(context.Background(), CreateSettings{}, &defaultCfg) + _, err = factory.CreateLogsExporter(context.Background(), Settings{}, &defaultCfg) assert.NoError(t, err) } @@ -220,20 +220,20 @@ type nopExporter struct { consumertest.Consumer } -func createTraces(context.Context, CreateSettings, component.Config) (Traces, error) { +func createTraces(context.Context, Settings, component.Config) (Traces, error) { return nopInstance, nil } -func createMetrics(context.Context, CreateSettings, component.Config) (Metrics, error) { +func createMetrics(context.Context, Settings, component.Config) (Metrics, error) { return nopInstance, nil } -func createLogs(context.Context, CreateSettings, component.Config) (Logs, error) { +func createLogs(context.Context, Settings, component.Config) (Logs, error) { return nopInstance, nil } -func createSettings(id component.ID) CreateSettings { - return CreateSettings{ +func createSettings(id component.ID) Settings { + return Settings{ ID: id, TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), diff --git a/exporter/exporterhelper/batch_sender.go b/exporter/exporterhelper/batch_sender.go index 3501fc3efb0..a1c8bc6903c 100644 --- a/exporter/exporterhelper/batch_sender.go +++ b/exporter/exporterhelper/batch_sender.go @@ -45,7 +45,7 @@ type batchSender struct { } // newBatchSender returns a new batch consumer component. -func newBatchSender(cfg exporterbatcher.Config, set exporter.CreateSettings, +func newBatchSender(cfg exporterbatcher.Config, set exporter.Settings, mf exporterbatcher.BatchMergeFunc[Request], msf exporterbatcher.BatchMergeSplitFunc[Request]) *batchSender { bs := &batchSender{ activeBatch: newEmptyBatch(), diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index aa84e9019f2..e07a1a37189 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -231,7 +231,7 @@ type baseExporter struct { marshaler exporterqueue.Marshaler[Request] unmarshaler exporterqueue.Unmarshaler[Request] - set exporter.CreateSettings + set exporter.Settings obsrep *ObsReport // Message for the user to be added with an export failure message. @@ -249,7 +249,7 @@ type baseExporter struct { consumerOptions []consumer.Option } -func newBaseExporter(set exporter.CreateSettings, signal component.DataType, osf obsrepSenderFactory, options ...Option) (*baseExporter, error) { +func newBaseExporter(set exporter.Settings, signal component.DataType, osf obsrepSenderFactory, options ...Option) (*baseExporter, error) { obsReport, err := NewObsReport(ObsReportSettings{ExporterID: set.ID, ExporterCreateSettings: set}) if err != nil { return nil, err diff --git a/exporter/exporterhelper/common_test.go b/exporter/exporterhelper/common_test.go index d79b7c07918..8a2602f8a91 100644 --- a/exporter/exporterhelper/common_test.go +++ b/exporter/exporterhelper/common_test.go @@ -26,8 +26,8 @@ var ( defaultType = component.MustNewType("test") defaultDataType = component.DataTypeMetrics defaultID = component.NewID(defaultType) - defaultSettings = func() exporter.CreateSettings { - set := exportertest.NewNopCreateSettings() + defaultSettings = func() exporter.Settings { + set := exportertest.NewNopSettings() set.ID = defaultID return set }() @@ -67,16 +67,16 @@ func checkStatus(t *testing.T, sd sdktrace.ReadOnlySpan, err error) { } func TestQueueOptionsWithRequestExporter(t *testing.T) { - bs, err := newBaseExporter(exportertest.NewNopCreateSettings(), defaultDataType, newNoopObsrepSender, + bs, err := newBaseExporter(exportertest.NewNopSettings(), defaultDataType, newNoopObsrepSender, WithRetry(configretry.NewDefaultBackOffConfig())) require.Nil(t, err) require.Nil(t, bs.marshaler) require.Nil(t, bs.unmarshaler) - _, err = newBaseExporter(exportertest.NewNopCreateSettings(), defaultDataType, newNoopObsrepSender, + _, err = newBaseExporter(exportertest.NewNopSettings(), defaultDataType, newNoopObsrepSender, WithRetry(configretry.NewDefaultBackOffConfig()), WithQueue(NewDefaultQueueSettings())) require.Error(t, err) - _, err = newBaseExporter(exportertest.NewNopCreateSettings(), defaultDataType, newNoopObsrepSender, + _, err = newBaseExporter(exportertest.NewNopSettings(), defaultDataType, newNoopObsrepSender, withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})), WithRetry(configretry.NewDefaultBackOffConfig()), WithRequestQueue(exporterqueue.NewDefaultConfig(), exporterqueue.NewMemoryQueueFactory[Request]())) @@ -84,7 +84,7 @@ func TestQueueOptionsWithRequestExporter(t *testing.T) { } func TestBaseExporterLogging(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() logger, observed := observer.New(zap.DebugLevel) set.Logger = zap.New(logger) rCfg := configretry.NewDefaultBackOffConfig() diff --git a/exporter/exporterhelper/generated_component_telemetry_test.go b/exporter/exporterhelper/generated_component_telemetry_test.go index f12aeee27de..f80e23147a7 100644 --- a/exporter/exporterhelper/generated_component_telemetry_test.go +++ b/exporter/exporterhelper/generated_component_telemetry_test.go @@ -21,8 +21,8 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -func (tt *componentTestTelemetry) NewCreateSettings() exporter.CreateSettings { - settings := exportertest.NewNopCreateSettings() +func (tt *componentTestTelemetry) NewSettings() exporter.Settings { + settings := exportertest.NewNopSettings() settings.MeterProvider = tt.meterProvider settings.ID = component.NewID(component.MustNewType("exporterhelper")) diff --git a/exporter/exporterhelper/logs.go b/exporter/exporterhelper/logs.go index 2706ec7fe92..c8505f5b97c 100644 --- a/exporter/exporterhelper/logs.go +++ b/exporter/exporterhelper/logs.go @@ -71,7 +71,7 @@ type logsExporter struct { // NewLogsExporter creates an exporter.Logs that records observability metrics and wraps every request with a Span. func NewLogsExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, pusher consumer.ConsumeLogsFunc, options ...Option, @@ -106,7 +106,7 @@ func requestFromLogs(pusher consumer.ConsumeLogsFunc) RequestFromLogsFunc { // until https://github.com/open-telemetry/opentelemetry-collector/issues/8122 is resolved. func NewLogsRequestExporter( _ context.Context, - set exporter.CreateSettings, + set exporter.Settings, converter RequestFromLogsFunc, options ...Option, ) (exporter.Logs, error) { diff --git a/exporter/exporterhelper/logs_test.go b/exporter/exporterhelper/logs_test.go index 827a383e279..c6b48ebdf41 100644 --- a/exporter/exporterhelper/logs_test.go +++ b/exporter/exporterhelper/logs_test.go @@ -53,38 +53,38 @@ func TestLogsRequest(t *testing.T) { } func TestLogsExporter_InvalidName(t *testing.T) { - le, err := NewLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), nil, newPushLogsData(nil)) + le, err := NewLogsExporter(context.Background(), exportertest.NewNopSettings(), nil, newPushLogsData(nil)) require.Nil(t, le) require.Equal(t, errNilConfig, err) } func TestLogsExporter_NilLogger(t *testing.T) { - le, err := NewLogsExporter(context.Background(), exporter.CreateSettings{}, &fakeLogsExporterConfig, newPushLogsData(nil)) + le, err := NewLogsExporter(context.Background(), exporter.Settings{}, &fakeLogsExporterConfig, newPushLogsData(nil)) require.Nil(t, le) require.Equal(t, errNilLogger, err) } func TestLogsRequestExporter_NilLogger(t *testing.T) { - le, err := NewLogsRequestExporter(context.Background(), exporter.CreateSettings{}, (&fakeRequestConverter{}).requestFromLogsFunc) + le, err := NewLogsRequestExporter(context.Background(), exporter.Settings{}, (&fakeRequestConverter{}).requestFromLogsFunc) require.Nil(t, le) require.Equal(t, errNilLogger, err) } func TestLogsExporter_NilPushLogsData(t *testing.T) { - le, err := NewLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeLogsExporterConfig, nil) + le, err := NewLogsExporter(context.Background(), exportertest.NewNopSettings(), &fakeLogsExporterConfig, nil) require.Nil(t, le) require.Equal(t, errNilPushLogsData, err) } func TestLogsRequestExporter_NilLogsConverter(t *testing.T) { - le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), nil) + le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopSettings(), nil) require.Nil(t, le) require.Equal(t, errNilLogsConverter, err) } func TestLogsExporter_Default(t *testing.T) { ld := plog.NewLogs() - le, err := NewLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeLogsExporterConfig, newPushLogsData(nil)) + le, err := NewLogsExporter(context.Background(), exportertest.NewNopSettings(), &fakeLogsExporterConfig, newPushLogsData(nil)) assert.NotNil(t, le) assert.NoError(t, err) @@ -96,7 +96,7 @@ func TestLogsExporter_Default(t *testing.T) { func TestLogsRequestExporter_Default(t *testing.T) { ld := plog.NewLogs() - le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromLogsFunc) assert.NotNil(t, le) assert.NoError(t, err) @@ -109,7 +109,7 @@ func TestLogsRequestExporter_Default(t *testing.T) { func TestLogsExporter_WithCapabilities(t *testing.T) { capabilities := consumer.Capabilities{MutatesData: true} - le, err := NewLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeLogsExporterConfig, newPushLogsData(nil), WithCapabilities(capabilities)) + le, err := NewLogsExporter(context.Background(), exportertest.NewNopSettings(), &fakeLogsExporterConfig, newPushLogsData(nil), WithCapabilities(capabilities)) require.NoError(t, err) require.NotNil(t, le) @@ -118,7 +118,7 @@ func TestLogsExporter_WithCapabilities(t *testing.T) { func TestLogsRequestExporter_WithCapabilities(t *testing.T) { capabilities := consumer.Capabilities{MutatesData: true} - le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromLogsFunc, WithCapabilities(capabilities)) require.NoError(t, err) require.NotNil(t, le) @@ -129,7 +129,7 @@ func TestLogsRequestExporter_WithCapabilities(t *testing.T) { func TestLogsExporter_Default_ReturnError(t *testing.T) { ld := plog.NewLogs() want := errors.New("my_error") - le, err := NewLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeLogsExporterConfig, newPushLogsData(want)) + le, err := NewLogsExporter(context.Background(), exportertest.NewNopSettings(), &fakeLogsExporterConfig, newPushLogsData(want)) require.NoError(t, err) require.NotNil(t, le) require.Equal(t, want, le.ConsumeLogs(context.Background(), ld)) @@ -138,7 +138,7 @@ func TestLogsExporter_Default_ReturnError(t *testing.T) { func TestLogsRequestExporter_Default_ConvertError(t *testing.T) { ld := plog.NewLogs() want := errors.New("convert_error") - le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{logsError: want}).requestFromLogsFunc) require.NoError(t, err) require.NotNil(t, le) @@ -148,7 +148,7 @@ func TestLogsRequestExporter_Default_ConvertError(t *testing.T) { func TestLogsRequestExporter_Default_ExportError(t *testing.T) { ld := plog.NewLogs() want := errors.New("export_error") - le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{requestError: want}).requestFromLogsFunc) require.NoError(t, err) require.NotNil(t, le) @@ -161,7 +161,7 @@ func TestLogsExporter_WithPersistentQueue(t *testing.T) { qCfg.StorageID = &storageID rCfg := configretry.NewDefaultBackOffConfig() ts := consumertest.LogsSink{} - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() set.ID = component.MustNewIDWithName("test_logs", "with_persistent_queue") te, err := NewLogsExporter(context.Background(), set, &fakeLogsExporterConfig, ts.ConsumeLogs, WithRetry(rCfg), WithQueue(qCfg)) require.NoError(t, err) @@ -184,7 +184,7 @@ func TestLogsExporter_WithRecordMetrics(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - le, err := NewLogsExporter(context.Background(), exporter.CreateSettings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeLogsExporterConfig, newPushLogsData(nil)) + le, err := NewLogsExporter(context.Background(), exporter.Settings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeLogsExporterConfig, newPushLogsData(nil)) require.NoError(t, err) require.NotNil(t, le) @@ -197,7 +197,7 @@ func TestLogsRequestExporter_WithRecordMetrics(t *testing.T) { t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) le, err := NewLogsRequestExporter(context.Background(), - exporter.CreateSettings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + exporter.Settings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, (&fakeRequestConverter{}).requestFromLogsFunc) require.NoError(t, err) require.NotNil(t, le) @@ -211,7 +211,7 @@ func TestLogsExporter_WithRecordMetrics_ReturnError(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - le, err := NewLogsExporter(context.Background(), exporter.CreateSettings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeLogsExporterConfig, newPushLogsData(want)) + le, err := NewLogsExporter(context.Background(), exporter.Settings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeLogsExporterConfig, newPushLogsData(want)) require.Nil(t, err) require.NotNil(t, le) @@ -224,7 +224,7 @@ func TestLogsRequestExporter_WithRecordMetrics_ExportError(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - le, err := NewLogsRequestExporter(context.Background(), exporter.CreateSettings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + le, err := NewLogsRequestExporter(context.Background(), exporter.Settings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, (&fakeRequestConverter{requestError: want}).requestFromLogsFunc) require.Nil(t, err) require.NotNil(t, le) @@ -242,7 +242,7 @@ func TestLogsExporter_WithRecordEnqueueFailedMetrics(t *testing.T) { qCfg.NumConsumers = 1 qCfg.QueueSize = 2 wantErr := errors.New("some-error") - te, err := NewLogsExporter(context.Background(), exporter.CreateSettings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeLogsExporterConfig, newPushLogsData(wantErr), WithRetry(rCfg), WithQueue(qCfg)) + te, err := NewLogsExporter(context.Background(), exporter.Settings{ID: fakeLogsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeLogsExporterConfig, newPushLogsData(wantErr), WithRetry(rCfg), WithQueue(qCfg)) require.NoError(t, err) require.NotNil(t, te) @@ -258,7 +258,7 @@ func TestLogsExporter_WithRecordEnqueueFailedMetrics(t *testing.T) { } func TestLogsExporter_WithSpan(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -271,7 +271,7 @@ func TestLogsExporter_WithSpan(t *testing.T) { } func TestLogsRequestExporter_WithSpan(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -284,7 +284,7 @@ func TestLogsRequestExporter_WithSpan(t *testing.T) { } func TestLogsExporter_WithSpan_ReturnError(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -298,7 +298,7 @@ func TestLogsExporter_WithSpan_ReturnError(t *testing.T) { } func TestLogsRequestExporter_WithSpan_ReturnError(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -315,7 +315,7 @@ func TestLogsExporter_WithShutdown(t *testing.T) { shutdownCalled := false shutdown := func(context.Context) error { shutdownCalled = true; return nil } - le, err := NewLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeLogsExporterConfig, newPushLogsData(nil), WithShutdown(shutdown)) + le, err := NewLogsExporter(context.Background(), exportertest.NewNopSettings(), &fakeLogsExporterConfig, newPushLogsData(nil), WithShutdown(shutdown)) assert.NotNil(t, le) assert.NoError(t, err) @@ -327,7 +327,7 @@ func TestLogsRequestExporter_WithShutdown(t *testing.T) { shutdownCalled := false shutdown := func(context.Context) error { shutdownCalled = true; return nil } - le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromLogsFunc, WithShutdown(shutdown)) assert.NotNil(t, le) assert.NoError(t, err) @@ -340,7 +340,7 @@ func TestLogsExporter_WithShutdown_ReturnError(t *testing.T) { want := errors.New("my_error") shutdownErr := func(context.Context) error { return want } - le, err := NewLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeLogsExporterConfig, newPushLogsData(nil), WithShutdown(shutdownErr)) + le, err := NewLogsExporter(context.Background(), exportertest.NewNopSettings(), &fakeLogsExporterConfig, newPushLogsData(nil), WithShutdown(shutdownErr)) assert.NotNil(t, le) assert.NoError(t, err) @@ -351,7 +351,7 @@ func TestLogsRequestExporter_WithShutdown_ReturnError(t *testing.T) { want := errors.New("my_error") shutdownErr := func(context.Context) error { return want } - le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + le, err := NewLogsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromLogsFunc, WithShutdown(shutdownErr)) assert.NotNil(t, le) assert.NoError(t, err) diff --git a/exporter/exporterhelper/metrics.go b/exporter/exporterhelper/metrics.go index 83db18229dd..683dc576f7a 100644 --- a/exporter/exporterhelper/metrics.go +++ b/exporter/exporterhelper/metrics.go @@ -71,7 +71,7 @@ type metricsExporter struct { // NewMetricsExporter creates an exporter.Metrics that records observability metrics and wraps every request with a Span. func NewMetricsExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, pusher consumer.ConsumeMetricsFunc, options ...Option, @@ -106,7 +106,7 @@ func requestFromMetrics(pusher consumer.ConsumeMetricsFunc) RequestFromMetricsFu // until https://github.com/open-telemetry/opentelemetry-collector/issues/8122 is resolved. func NewMetricsRequestExporter( _ context.Context, - set exporter.CreateSettings, + set exporter.Settings, converter RequestFromMetricsFunc, options ...Option, ) (exporter.Metrics, error) { diff --git a/exporter/exporterhelper/metrics_test.go b/exporter/exporterhelper/metrics_test.go index 6ae88c4feaf..062c3af7297 100644 --- a/exporter/exporterhelper/metrics_test.go +++ b/exporter/exporterhelper/metrics_test.go @@ -53,39 +53,39 @@ func TestMetricsRequest(t *testing.T) { } func TestMetricsExporter_NilConfig(t *testing.T) { - me, err := NewMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), nil, newPushMetricsData(nil)) + me, err := NewMetricsExporter(context.Background(), exportertest.NewNopSettings(), nil, newPushMetricsData(nil)) require.Nil(t, me) require.Equal(t, errNilConfig, err) } func TestMetricsExporter_NilLogger(t *testing.T) { - me, err := NewMetricsExporter(context.Background(), exporter.CreateSettings{}, &fakeMetricsExporterConfig, newPushMetricsData(nil)) + me, err := NewMetricsExporter(context.Background(), exporter.Settings{}, &fakeMetricsExporterConfig, newPushMetricsData(nil)) require.Nil(t, me) require.Equal(t, errNilLogger, err) } func TestMetricsRequestExporter_NilLogger(t *testing.T) { - me, err := NewMetricsRequestExporter(context.Background(), exporter.CreateSettings{}, + me, err := NewMetricsRequestExporter(context.Background(), exporter.Settings{}, (&fakeRequestConverter{}).requestFromMetricsFunc) require.Nil(t, me) require.Equal(t, errNilLogger, err) } func TestMetricsExporter_NilPushMetricsData(t *testing.T) { - me, err := NewMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeMetricsExporterConfig, nil) + me, err := NewMetricsExporter(context.Background(), exportertest.NewNopSettings(), &fakeMetricsExporterConfig, nil) require.Nil(t, me) require.Equal(t, errNilPushMetricsData, err) } func TestMetricsRequestExporter_NilMetricsConverter(t *testing.T) { - me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), nil) + me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopSettings(), nil) require.Nil(t, me) require.Equal(t, errNilMetricsConverter, err) } func TestMetricsExporter_Default(t *testing.T) { md := pmetric.NewMetrics() - me, err := NewMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeMetricsExporterConfig, newPushMetricsData(nil)) + me, err := NewMetricsExporter(context.Background(), exportertest.NewNopSettings(), &fakeMetricsExporterConfig, newPushMetricsData(nil)) assert.NoError(t, err) assert.NotNil(t, me) @@ -97,7 +97,7 @@ func TestMetricsExporter_Default(t *testing.T) { func TestMetricsRequestExporter_Default(t *testing.T) { md := pmetric.NewMetrics() - me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromMetricsFunc) assert.NoError(t, err) assert.NotNil(t, me) @@ -110,7 +110,7 @@ func TestMetricsRequestExporter_Default(t *testing.T) { func TestMetricsExporter_WithCapabilities(t *testing.T) { capabilities := consumer.Capabilities{MutatesData: true} - me, err := NewMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeMetricsExporterConfig, newPushMetricsData(nil), WithCapabilities(capabilities)) + me, err := NewMetricsExporter(context.Background(), exportertest.NewNopSettings(), &fakeMetricsExporterConfig, newPushMetricsData(nil), WithCapabilities(capabilities)) assert.NoError(t, err) assert.NotNil(t, me) @@ -119,7 +119,7 @@ func TestMetricsExporter_WithCapabilities(t *testing.T) { func TestMetricsRequestExporter_WithCapabilities(t *testing.T) { capabilities := consumer.Capabilities{MutatesData: true} - me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromMetricsFunc, WithCapabilities(capabilities)) assert.NoError(t, err) assert.NotNil(t, me) @@ -130,7 +130,7 @@ func TestMetricsRequestExporter_WithCapabilities(t *testing.T) { func TestMetricsExporter_Default_ReturnError(t *testing.T) { md := pmetric.NewMetrics() want := errors.New("my_error") - me, err := NewMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeMetricsExporterConfig, newPushMetricsData(want)) + me, err := NewMetricsExporter(context.Background(), exportertest.NewNopSettings(), &fakeMetricsExporterConfig, newPushMetricsData(want)) require.NoError(t, err) require.NotNil(t, me) require.Equal(t, want, me.ConsumeMetrics(context.Background(), md)) @@ -139,7 +139,7 @@ func TestMetricsExporter_Default_ReturnError(t *testing.T) { func TestMetricsRequestExporter_Default_ConvertError(t *testing.T) { md := pmetric.NewMetrics() want := errors.New("convert_error") - me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{metricsError: want}).requestFromMetricsFunc) require.NoError(t, err) require.NotNil(t, me) @@ -149,7 +149,7 @@ func TestMetricsRequestExporter_Default_ConvertError(t *testing.T) { func TestMetricsRequestExporter_Default_ExportError(t *testing.T) { md := pmetric.NewMetrics() want := errors.New("export_error") - me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{requestError: want}).requestFromMetricsFunc) require.NoError(t, err) require.NotNil(t, me) @@ -162,7 +162,7 @@ func TestMetricsExporter_WithPersistentQueue(t *testing.T) { qCfg.StorageID = &storageID rCfg := configretry.NewDefaultBackOffConfig() ms := consumertest.MetricsSink{} - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() set.ID = component.MustNewIDWithName("test_metrics", "with_persistent_queue") te, err := NewMetricsExporter(context.Background(), set, &fakeTracesExporterConfig, ms.ConsumeMetrics, WithRetry(rCfg), WithQueue(qCfg)) require.NoError(t, err) @@ -185,7 +185,7 @@ func TestMetricsExporter_WithRecordMetrics(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - me, err := NewMetricsExporter(context.Background(), exporter.CreateSettings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeMetricsExporterConfig, newPushMetricsData(nil)) + me, err := NewMetricsExporter(context.Background(), exporter.Settings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeMetricsExporterConfig, newPushMetricsData(nil)) require.NoError(t, err) require.NotNil(t, me) @@ -198,7 +198,7 @@ func TestMetricsRequestExporter_WithRecordMetrics(t *testing.T) { t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) me, err := NewMetricsRequestExporter(context.Background(), - exporter.CreateSettings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + exporter.Settings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, (&fakeRequestConverter{}).requestFromMetricsFunc) require.NoError(t, err) require.NotNil(t, me) @@ -212,7 +212,7 @@ func TestMetricsExporter_WithRecordMetrics_ReturnError(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - me, err := NewMetricsExporter(context.Background(), exporter.CreateSettings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeMetricsExporterConfig, newPushMetricsData(want)) + me, err := NewMetricsExporter(context.Background(), exporter.Settings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeMetricsExporterConfig, newPushMetricsData(want)) require.NoError(t, err) require.NotNil(t, me) @@ -226,7 +226,7 @@ func TestMetricsRequestExporter_WithRecordMetrics_ExportError(t *testing.T) { t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) me, err := NewMetricsRequestExporter(context.Background(), - exporter.CreateSettings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + exporter.Settings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, (&fakeRequestConverter{requestError: want}).requestFromMetricsFunc) require.NoError(t, err) require.NotNil(t, me) @@ -244,7 +244,7 @@ func TestMetricsExporter_WithRecordEnqueueFailedMetrics(t *testing.T) { qCfg.NumConsumers = 1 qCfg.QueueSize = 2 wantErr := errors.New("some-error") - te, err := NewMetricsExporter(context.Background(), exporter.CreateSettings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeMetricsExporterConfig, newPushMetricsData(wantErr), WithRetry(rCfg), WithQueue(qCfg)) + te, err := NewMetricsExporter(context.Background(), exporter.Settings{ID: fakeMetricsExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeMetricsExporterConfig, newPushMetricsData(wantErr), WithRetry(rCfg), WithQueue(qCfg)) require.NoError(t, err) require.NotNil(t, te) @@ -260,7 +260,7 @@ func TestMetricsExporter_WithRecordEnqueueFailedMetrics(t *testing.T) { } func TestMetricsExporter_WithSpan(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -273,7 +273,7 @@ func TestMetricsExporter_WithSpan(t *testing.T) { } func TestMetricsRequestExporter_WithSpan(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -286,7 +286,7 @@ func TestMetricsRequestExporter_WithSpan(t *testing.T) { } func TestMetricsExporter_WithSpan_ReturnError(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -300,7 +300,7 @@ func TestMetricsExporter_WithSpan_ReturnError(t *testing.T) { } func TestMetricsRequestExporter_WithSpan_ExportError(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -317,7 +317,7 @@ func TestMetricsExporter_WithShutdown(t *testing.T) { shutdownCalled := false shutdown := func(context.Context) error { shutdownCalled = true; return nil } - me, err := NewMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeMetricsExporterConfig, newPushMetricsData(nil), WithShutdown(shutdown)) + me, err := NewMetricsExporter(context.Background(), exportertest.NewNopSettings(), &fakeMetricsExporterConfig, newPushMetricsData(nil), WithShutdown(shutdown)) assert.NotNil(t, me) assert.NoError(t, err) @@ -330,7 +330,7 @@ func TestMetricsRequestExporter_WithShutdown(t *testing.T) { shutdownCalled := false shutdown := func(context.Context) error { shutdownCalled = true; return nil } - me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromMetricsFunc, WithShutdown(shutdown)) assert.NotNil(t, me) assert.NoError(t, err) @@ -344,7 +344,7 @@ func TestMetricsExporter_WithShutdown_ReturnError(t *testing.T) { want := errors.New("my_error") shutdownErr := func(context.Context) error { return want } - me, err := NewMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeMetricsExporterConfig, newPushMetricsData(nil), WithShutdown(shutdownErr)) + me, err := NewMetricsExporter(context.Background(), exportertest.NewNopSettings(), &fakeMetricsExporterConfig, newPushMetricsData(nil), WithShutdown(shutdownErr)) assert.NotNil(t, me) assert.NoError(t, err) @@ -356,7 +356,7 @@ func TestMetricsRequestExporter_WithShutdown_ReturnError(t *testing.T) { want := errors.New("my_error") shutdownErr := func(context.Context) error { return want } - me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + me, err := NewMetricsRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromMetricsFunc, WithShutdown(shutdownErr)) assert.NotNil(t, me) assert.NoError(t, err) diff --git a/exporter/exporterhelper/obsexporter.go b/exporter/exporterhelper/obsexporter.go index e3a78c34b04..f71971cef1d 100644 --- a/exporter/exporterhelper/obsexporter.go +++ b/exporter/exporterhelper/obsexporter.go @@ -33,7 +33,7 @@ type ObsReport struct { // ObsReportSettings are settings for creating an ObsReport. type ObsReportSettings struct { ExporterID component.ID - ExporterCreateSettings exporter.CreateSettings + ExporterCreateSettings exporter.Settings } // NewObsReport creates a new Exporter. diff --git a/exporter/exporterhelper/obsexporter_test.go b/exporter/exporterhelper/obsexporter_test.go index 63da5fcf803..b7a6b09a909 100644 --- a/exporter/exporterhelper/obsexporter_test.go +++ b/exporter/exporterhelper/obsexporter_test.go @@ -32,7 +32,7 @@ func TestExportTraceDataOp(t *testing.T) { obsrep, err := newExporter(ObsReportSettings{ ExporterID: exporterID, - ExporterCreateSettings: exporter.CreateSettings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ExporterCreateSettings: exporter.Settings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) @@ -80,7 +80,7 @@ func TestExportMetricsOp(t *testing.T) { obsrep, err := newExporter(ObsReportSettings{ ExporterID: exporterID, - ExporterCreateSettings: exporter.CreateSettings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ExporterCreateSettings: exporter.Settings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) @@ -129,7 +129,7 @@ func TestExportLogsOp(t *testing.T) { obsrep, err := newExporter(ObsReportSettings{ ExporterID: exporterID, - ExporterCreateSettings: exporter.CreateSettings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ExporterCreateSettings: exporter.Settings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) @@ -178,7 +178,7 @@ func TestCheckExporterTracesViews(t *testing.T) { obsrep, err := NewObsReport(ObsReportSettings{ ExporterID: exporterID, - ExporterCreateSettings: exporter.CreateSettings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ExporterCreateSettings: exporter.Settings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) ctx := obsrep.StartTracesOp(context.Background()) @@ -198,7 +198,7 @@ func TestCheckExporterMetricsViews(t *testing.T) { obsrep, err := NewObsReport(ObsReportSettings{ ExporterID: exporterID, - ExporterCreateSettings: exporter.CreateSettings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ExporterCreateSettings: exporter.Settings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) ctx := obsrep.StartMetricsOp(context.Background()) @@ -218,7 +218,7 @@ func TestCheckExporterLogsViews(t *testing.T) { obsrep, err := NewObsReport(ObsReportSettings{ ExporterID: exporterID, - ExporterCreateSettings: exporter.CreateSettings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ExporterCreateSettings: exporter.Settings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) ctx := obsrep.StartLogsOp(context.Background()) diff --git a/exporter/exporterhelper/obsreport_test.go b/exporter/exporterhelper/obsreport_test.go index e0101f112df..daafd422e61 100644 --- a/exporter/exporterhelper/obsreport_test.go +++ b/exporter/exporterhelper/obsreport_test.go @@ -22,7 +22,7 @@ func TestExportEnqueueFailure(t *testing.T) { obsrep, err := NewObsReport(ObsReportSettings{ ExporterID: exporterID, - ExporterCreateSettings: exporter.CreateSettings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ExporterCreateSettings: exporter.Settings{ID: exporterID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index 3e539d7f9a0..48dd0476572 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -85,7 +85,7 @@ type queueSender struct { metricSize otelmetric.Int64ObservableGauge } -func newQueueSender(q exporterqueue.Queue[Request], set exporter.CreateSettings, numConsumers int, +func newQueueSender(q exporterqueue.Queue[Request], set exporter.Settings, numConsumers int, exportFailureMessage string) *queueSender { qs := &queueSender{ fullName: set.ID.String(), diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index 4775938eb55..e04f8b3c2bc 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -90,7 +90,7 @@ func TestQueuedRetry_RejectOnFull(t *testing.T) { qCfg := NewDefaultQueueSettings() qCfg.QueueSize = 0 qCfg.NumConsumers = 0 - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() logger, observed := observer.New(zap.ErrorLevel) set.Logger = zap.New(logger) be, err := newBaseExporter(set, defaultDataType, newNoopObsrepSender, @@ -165,7 +165,7 @@ func TestQueuedRetryHappyPath(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tel.Shutdown(context.Background())) }) - set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tel.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} + set := exporter.Settings{ID: defaultID, TelemetrySettings: tel.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} be, err := newBaseExporter(set, defaultDataType, newObservabilityConsumerSender, tt.queueOptions...) require.NoError(t, err) ocs := be.obsrepSender.(*observabilityConsumerSender) @@ -208,7 +208,7 @@ func TestQueuedRetry_QueueMetricsReported(t *testing.T) { qCfg := NewDefaultQueueSettings() qCfg.NumConsumers = 0 // to make every request go straight to the queue rCfg := configretry.NewDefaultBackOffConfig() - set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} + set := exporter.Settings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} be, err := newBaseExporter(set, defaultDataType, newObservabilityConsumerSender, withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})), WithRetry(rCfg), WithQueue(qCfg)) @@ -289,7 +289,7 @@ func TestQueueRetryWithDisabledQueue(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() logger, observed := observer.New(zap.ErrorLevel) set.Logger = zap.New(logger) be, err := newBaseExporter(set, component.DataTypeLogs, newObservabilityConsumerSender, tt.queueOptions...) @@ -313,7 +313,7 @@ func TestQueueRetryWithDisabledQueue(t *testing.T) { } func TestQueueFailedRequestDropped(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() logger, observed := observer.New(zap.ErrorLevel) set.Logger = zap.New(logger) be, err := newBaseExporter(set, component.DataTypeLogs, newNoopObsrepSender, @@ -337,7 +337,7 @@ func TestQueuedRetryPersistenceEnabled(t *testing.T) { storageID := component.MustNewIDWithName("file_storage", "storage") qCfg.StorageID = &storageID // enable persistence rCfg := configretry.NewDefaultBackOffConfig() - set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} + set := exporter.Settings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} be, err := newBaseExporter(set, defaultDataType, newObservabilityConsumerSender, withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})), WithRetry(rCfg), WithQueue(qCfg)) @@ -363,7 +363,7 @@ func TestQueuedRetryPersistenceEnabledStorageError(t *testing.T) { storageID := component.MustNewIDWithName("file_storage", "storage") qCfg.StorageID = &storageID // enable persistence rCfg := configretry.NewDefaultBackOffConfig() - set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} + set := exporter.Settings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} be, err := newBaseExporter(set, defaultDataType, newObservabilityConsumerSender, withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})), WithRetry(rCfg), WithQueue(qCfg)) require.NoError(t, err) @@ -424,7 +424,7 @@ func TestQueuedRetryPersistentEnabled_NoDataLossOnShutdown(t *testing.T) { func TestQueueSenderNoStartShutdown(t *testing.T) { queue := queue.NewBoundedMemoryQueue[Request](queue.MemoryQueueSettings[Request]{}) - qs := newQueueSender(queue, exportertest.NewNopCreateSettings(), 1, "") + qs := newQueueSender(queue, exportertest.NewNopSettings(), 1, "") assert.NoError(t, qs.Shutdown(context.Background())) } diff --git a/exporter/exporterhelper/retry_sender.go b/exporter/exporterhelper/retry_sender.go index 6e8a36f9ef4..03b1dba80cc 100644 --- a/exporter/exporterhelper/retry_sender.go +++ b/exporter/exporterhelper/retry_sender.go @@ -51,7 +51,7 @@ type retrySender struct { logger *zap.Logger } -func newRetrySender(config configretry.BackOffConfig, set exporter.CreateSettings) *retrySender { +func newRetrySender(config configretry.BackOffConfig, set exporter.Settings) *retrySender { return &retrySender{ traceAttribute: attribute.String(obsmetrics.ExporterKey, set.ID.String()), cfg: config, diff --git a/exporter/exporterhelper/retry_sender_test.go b/exporter/exporterhelper/retry_sender_test.go index ef47597c62e..57a653d2a3d 100644 --- a/exporter/exporterhelper/retry_sender_test.go +++ b/exporter/exporterhelper/retry_sender_test.go @@ -229,7 +229,7 @@ func TestQueuedRetry_RetryOnError(t *testing.T) { func TestQueueRetryWithNoQueue(t *testing.T) { rCfg := configretry.NewDefaultBackOffConfig() rCfg.MaxElapsedTime = time.Nanosecond // fail fast - be, err := newBaseExporter(exportertest.NewNopCreateSettings(), component.DataTypeLogs, newObservabilityConsumerSender, WithRetry(rCfg)) + be, err := newBaseExporter(exportertest.NewNopSettings(), component.DataTypeLogs, newObservabilityConsumerSender, WithRetry(rCfg)) require.NoError(t, err) require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost())) ocs := be.obsrepSender.(*observabilityConsumerSender) @@ -247,7 +247,7 @@ func TestQueueRetryWithNoQueue(t *testing.T) { func TestQueueRetryWithDisabledRetires(t *testing.T) { rCfg := configretry.NewDefaultBackOffConfig() rCfg.Enabled = false - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() logger, observed := observer.New(zap.ErrorLevel) set.Logger = zap.New(logger) be, err := newBaseExporter(set, component.DataTypeLogs, newObservabilityConsumerSender, WithRetry(rCfg)) diff --git a/exporter/exporterhelper/traces.go b/exporter/exporterhelper/traces.go index 6f5f39f3de5..e510bae3dd3 100644 --- a/exporter/exporterhelper/traces.go +++ b/exporter/exporterhelper/traces.go @@ -71,7 +71,7 @@ type traceExporter struct { // NewTracesExporter creates an exporter.Traces that records observability metrics and wraps every request with a Span. func NewTracesExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, pusher consumer.ConsumeTracesFunc, options ...Option, @@ -106,7 +106,7 @@ func requestFromTraces(pusher consumer.ConsumeTracesFunc) RequestFromTracesFunc // until https://github.com/open-telemetry/opentelemetry-collector/issues/8122 is resolved. func NewTracesRequestExporter( _ context.Context, - set exporter.CreateSettings, + set exporter.Settings, converter RequestFromTracesFunc, options ...Option, ) (exporter.Traces, error) { diff --git a/exporter/exporterhelper/traces_test.go b/exporter/exporterhelper/traces_test.go index 42810bc8bb1..60f0006a10c 100644 --- a/exporter/exporterhelper/traces_test.go +++ b/exporter/exporterhelper/traces_test.go @@ -49,38 +49,38 @@ func TestTracesRequest(t *testing.T) { } func TestTracesExporter_InvalidName(t *testing.T) { - te, err := NewTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), nil, newTraceDataPusher(nil)) + te, err := NewTracesExporter(context.Background(), exportertest.NewNopSettings(), nil, newTraceDataPusher(nil)) require.Nil(t, te) require.Equal(t, errNilConfig, err) } func TestTracesExporter_NilLogger(t *testing.T) { - te, err := NewTracesExporter(context.Background(), exporter.CreateSettings{}, &fakeTracesExporterConfig, newTraceDataPusher(nil)) + te, err := NewTracesExporter(context.Background(), exporter.Settings{}, &fakeTracesExporterConfig, newTraceDataPusher(nil)) require.Nil(t, te) require.Equal(t, errNilLogger, err) } func TestTracesRequestExporter_NilLogger(t *testing.T) { - te, err := NewTracesRequestExporter(context.Background(), exporter.CreateSettings{}, (&fakeRequestConverter{}).requestFromTracesFunc) + te, err := NewTracesRequestExporter(context.Background(), exporter.Settings{}, (&fakeRequestConverter{}).requestFromTracesFunc) require.Nil(t, te) require.Equal(t, errNilLogger, err) } func TestTracesExporter_NilPushTraceData(t *testing.T) { - te, err := NewTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeTracesExporterConfig, nil) + te, err := NewTracesExporter(context.Background(), exportertest.NewNopSettings(), &fakeTracesExporterConfig, nil) require.Nil(t, te) require.Equal(t, errNilPushTraceData, err) } func TestTracesRequestExporter_NilTracesConverter(t *testing.T) { - te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), nil) + te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopSettings(), nil) require.Nil(t, te) require.Equal(t, errNilTracesConverter, err) } func TestTracesExporter_Default(t *testing.T) { td := ptrace.NewTraces() - te, err := NewTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeTracesExporterConfig, newTraceDataPusher(nil)) + te, err := NewTracesExporter(context.Background(), exportertest.NewNopSettings(), &fakeTracesExporterConfig, newTraceDataPusher(nil)) assert.NotNil(t, te) assert.NoError(t, err) @@ -92,7 +92,7 @@ func TestTracesExporter_Default(t *testing.T) { func TestTracesRequestExporter_Default(t *testing.T) { td := ptrace.NewTraces() - te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromTracesFunc) assert.NotNil(t, te) assert.NoError(t, err) @@ -105,7 +105,7 @@ func TestTracesRequestExporter_Default(t *testing.T) { func TestTracesExporter_WithCapabilities(t *testing.T) { capabilities := consumer.Capabilities{MutatesData: true} - te, err := NewTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeTracesExporterConfig, newTraceDataPusher(nil), WithCapabilities(capabilities)) + te, err := NewTracesExporter(context.Background(), exportertest.NewNopSettings(), &fakeTracesExporterConfig, newTraceDataPusher(nil), WithCapabilities(capabilities)) assert.NotNil(t, te) assert.NoError(t, err) @@ -114,7 +114,7 @@ func TestTracesExporter_WithCapabilities(t *testing.T) { func TestTracesRequestExporter_WithCapabilities(t *testing.T) { capabilities := consumer.Capabilities{MutatesData: true} - te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromTracesFunc, WithCapabilities(capabilities)) assert.NotNil(t, te) assert.NoError(t, err) @@ -125,7 +125,7 @@ func TestTracesRequestExporter_WithCapabilities(t *testing.T) { func TestTracesExporter_Default_ReturnError(t *testing.T) { td := ptrace.NewTraces() want := errors.New("my_error") - te, err := NewTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeTracesExporterConfig, newTraceDataPusher(want)) + te, err := NewTracesExporter(context.Background(), exportertest.NewNopSettings(), &fakeTracesExporterConfig, newTraceDataPusher(want)) require.NoError(t, err) require.NotNil(t, te) @@ -136,7 +136,7 @@ func TestTracesExporter_Default_ReturnError(t *testing.T) { func TestTracesRequestExporter_Default_ConvertError(t *testing.T) { td := ptrace.NewTraces() want := errors.New("convert_error") - te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{tracesError: want}).requestFromTracesFunc) require.NoError(t, err) require.NotNil(t, te) @@ -146,7 +146,7 @@ func TestTracesRequestExporter_Default_ConvertError(t *testing.T) { func TestTracesRequestExporter_Default_ExportError(t *testing.T) { td := ptrace.NewTraces() want := errors.New("export_error") - te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{requestError: want}).requestFromTracesFunc) require.NoError(t, err) require.NotNil(t, te) @@ -159,7 +159,7 @@ func TestTracesExporter_WithPersistentQueue(t *testing.T) { qCfg.StorageID = &storageID rCfg := configretry.NewDefaultBackOffConfig() ts := consumertest.TracesSink{} - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() set.ID = component.MustNewIDWithName("test_traces", "with_persistent_queue") te, err := NewTracesExporter(context.Background(), set, &fakeTracesExporterConfig, ts.ConsumeTraces, WithRetry(rCfg), WithQueue(qCfg)) require.NoError(t, err) @@ -182,7 +182,7 @@ func TestTracesExporter_WithRecordMetrics(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - te, err := NewTracesExporter(context.Background(), exporter.CreateSettings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeTracesExporterConfig, newTraceDataPusher(nil)) + te, err := NewTracesExporter(context.Background(), exporter.Settings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeTracesExporterConfig, newTraceDataPusher(nil)) require.NoError(t, err) require.NotNil(t, te) @@ -195,7 +195,7 @@ func TestTracesRequestExporter_WithRecordMetrics(t *testing.T) { t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) te, err := NewTracesRequestExporter(context.Background(), - exporter.CreateSettings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + exporter.Settings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, (&fakeRequestConverter{}).requestFromTracesFunc) require.NoError(t, err) require.NotNil(t, te) @@ -209,7 +209,7 @@ func TestTracesExporter_WithRecordMetrics_ReturnError(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - te, err := NewTracesExporter(context.Background(), exporter.CreateSettings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeTracesExporterConfig, newTraceDataPusher(want)) + te, err := NewTracesExporter(context.Background(), exporter.Settings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeTracesExporterConfig, newTraceDataPusher(want)) require.NoError(t, err) require.NotNil(t, te) @@ -223,7 +223,7 @@ func TestTracesRequestExporter_WithRecordMetrics_RequestSenderError(t *testing.T t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) te, err := NewTracesRequestExporter(context.Background(), - exporter.CreateSettings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + exporter.Settings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, (&fakeRequestConverter{requestError: want}).requestFromTracesFunc) require.NoError(t, err) require.NotNil(t, te) @@ -241,7 +241,7 @@ func TestTracesExporter_WithRecordEnqueueFailedMetrics(t *testing.T) { qCfg.NumConsumers = 1 qCfg.QueueSize = 2 wantErr := errors.New("some-error") - te, err := NewTracesExporter(context.Background(), exporter.CreateSettings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeTracesExporterConfig, newTraceDataPusher(wantErr), WithRetry(rCfg), WithQueue(qCfg)) + te, err := NewTracesExporter(context.Background(), exporter.Settings{ID: fakeTracesExporterName, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, &fakeTracesExporterConfig, newTraceDataPusher(wantErr), WithRetry(rCfg), WithQueue(qCfg)) require.NoError(t, err) require.NotNil(t, te) @@ -257,7 +257,7 @@ func TestTracesExporter_WithRecordEnqueueFailedMetrics(t *testing.T) { } func TestTracesExporter_WithSpan(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -271,7 +271,7 @@ func TestTracesExporter_WithSpan(t *testing.T) { } func TestTracesRequestExporter_WithSpan(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -285,7 +285,7 @@ func TestTracesRequestExporter_WithSpan(t *testing.T) { } func TestTracesExporter_WithSpan_ReturnError(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -300,7 +300,7 @@ func TestTracesExporter_WithSpan_ReturnError(t *testing.T) { } func TestTracesRequestExporter_WithSpan_ExportError(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() sr := new(tracetest.SpanRecorder) set.TracerProvider = sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) otel.SetTracerProvider(set.TracerProvider) @@ -318,7 +318,7 @@ func TestTracesExporter_WithShutdown(t *testing.T) { shutdownCalled := false shutdown := func(context.Context) error { shutdownCalled = true; return nil } - te, err := NewTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeTracesExporterConfig, newTraceDataPusher(nil), WithShutdown(shutdown)) + te, err := NewTracesExporter(context.Background(), exportertest.NewNopSettings(), &fakeTracesExporterConfig, newTraceDataPusher(nil), WithShutdown(shutdown)) assert.NotNil(t, te) assert.NoError(t, err) @@ -331,7 +331,7 @@ func TestTracesRequestExporter_WithShutdown(t *testing.T) { shutdownCalled := false shutdown := func(context.Context) error { shutdownCalled = true; return nil } - te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromTracesFunc, WithShutdown(shutdown)) assert.NotNil(t, te) assert.NoError(t, err) @@ -345,7 +345,7 @@ func TestTracesExporter_WithShutdown_ReturnError(t *testing.T) { want := errors.New("my_error") shutdownErr := func(context.Context) error { return want } - te, err := NewTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), &fakeTracesExporterConfig, newTraceDataPusher(nil), WithShutdown(shutdownErr)) + te, err := NewTracesExporter(context.Background(), exportertest.NewNopSettings(), &fakeTracesExporterConfig, newTraceDataPusher(nil), WithShutdown(shutdownErr)) assert.NotNil(t, te) assert.NoError(t, err) @@ -357,7 +357,7 @@ func TestTracesRequestExporter_WithShutdown_ReturnError(t *testing.T) { want := errors.New("my_error") shutdownErr := func(context.Context) error { return want } - te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopCreateSettings(), + te, err := NewTracesRequestExporter(context.Background(), exportertest.NewNopSettings(), (&fakeRequestConverter{}).requestFromTracesFunc, WithShutdown(shutdownErr)) assert.NotNil(t, te) assert.NoError(t, err) diff --git a/exporter/exporterqueue/queue.go b/exporter/exporterqueue/queue.go index 5b568851b66..f47196ba124 100644 --- a/exporter/exporterqueue/queue.go +++ b/exporter/exporterqueue/queue.go @@ -25,7 +25,7 @@ type Queue[T any] queue.Queue[T] // Settings defines settings for creating a queue. type Settings struct { DataType component.DataType - ExporterSettings exporter.CreateSettings + ExporterSettings exporter.Settings } // Marshaler is a function that can marshal a request into bytes. diff --git a/exporter/exportertest/contract_checker.go b/exporter/exportertest/contract_checker.go index cf9eec1dbb4..0ae8f6b5c9a 100644 --- a/exporter/exportertest/contract_checker.go +++ b/exporter/exportertest/contract_checker.go @@ -110,7 +110,7 @@ func checkMetrics(t *testing.T, params CheckConsumeContractParams, mockReceiver ctx := context.Background() var exp exporter.Metrics var err error - exp, err = params.ExporterFactory.CreateMetricsExporter(ctx, NewNopCreateSettings(), params.ExporterConfig) + exp, err = params.ExporterFactory.CreateMetricsExporter(ctx, NewNopSettings(), params.ExporterConfig) require.NoError(t, err) require.NotNil(t, exp) @@ -150,7 +150,7 @@ func checkTraces(t *testing.T, params CheckConsumeContractParams, mockReceiver c ctx := context.Background() var exp exporter.Traces var err error - exp, err = params.ExporterFactory.CreateTracesExporter(ctx, NewNopCreateSettings(), params.ExporterConfig) + exp, err = params.ExporterFactory.CreateTracesExporter(ctx, NewNopSettings(), params.ExporterConfig) require.NoError(t, err) require.NotNil(t, exp) @@ -190,7 +190,7 @@ func checkLogs(t *testing.T, params CheckConsumeContractParams, mockReceiver com ctx := context.Background() var exp exporter.Logs var err error - exp, err = params.ExporterFactory.CreateLogsExporter(ctx, NewNopCreateSettings(), params.ExporterConfig) + exp, err = params.ExporterFactory.CreateLogsExporter(ctx, NewNopSettings(), params.ExporterConfig) require.NoError(t, err) require.NotNil(t, exp) diff --git a/exporter/exportertest/contract_checker_test.go b/exporter/exportertest/contract_checker_test.go index 97135bbb2c5..652f6bc5ac9 100644 --- a/exporter/exportertest/contract_checker_test.go +++ b/exporter/exportertest/contract_checker_test.go @@ -41,7 +41,7 @@ type mockExporterFactory struct { func (mef *mockExporterFactory) createMockTracesExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, ) (exporter.Traces, error) { return exporterhelper.NewTracesExporter(ctx, set, cfg, @@ -53,7 +53,7 @@ func (mef *mockExporterFactory) createMockTracesExporter( func (mef *mockExporterFactory) createMockMetricsExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, ) (exporter.Metrics, error) { return exporterhelper.NewMetricsExporter(ctx, set, cfg, @@ -65,7 +65,7 @@ func (mef *mockExporterFactory) createMockMetricsExporter( func (mef *mockExporterFactory) createMockLogsExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, ) (exporter.Logs, error) { return exporterhelper.NewLogsExporter(ctx, set, cfg, diff --git a/exporter/exportertest/nop_exporter.go b/exporter/exportertest/nop_exporter.go index 6589d867bec..34beae0c32a 100644 --- a/exporter/exportertest/nop_exporter.go +++ b/exporter/exportertest/nop_exporter.go @@ -17,8 +17,15 @@ import ( var nopType = component.MustNewType("nop") // NewNopCreateSettings returns a new nop settings for Create*Exporter functions. -func NewNopCreateSettings() exporter.CreateSettings { - return exporter.CreateSettings{ +// +// Deprecated: [v0.103.0] Use exportertest.NewNopSettings instead. +func NewNopCreateSettings() exporter.Settings { + return NewNopSettings() +} + +// NewNopSettings returns a new nop settings for Create*Exporter functions. +func NewNopSettings() exporter.Settings { + return exporter.Settings{ ID: component.NewIDWithName(nopType, uuid.NewString()), TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), @@ -36,15 +43,15 @@ func NewNopFactory() exporter.Factory { ) } -func createTracesExporter(context.Context, exporter.CreateSettings, component.Config) (exporter.Traces, error) { +func createTracesExporter(context.Context, exporter.Settings, component.Config) (exporter.Traces, error) { return nopInstance, nil } -func createMetricsExporter(context.Context, exporter.CreateSettings, component.Config) (exporter.Metrics, error) { +func createMetricsExporter(context.Context, exporter.Settings, component.Config) (exporter.Metrics, error) { return nopInstance, nil } -func createLogsExporter(context.Context, exporter.CreateSettings, component.Config) (exporter.Logs, error) { +func createLogsExporter(context.Context, exporter.Settings, component.Config) (exporter.Logs, error) { return nopInstance, nil } diff --git a/exporter/exportertest/nop_exporter_test.go b/exporter/exportertest/nop_exporter_test.go index 6ae95efc08d..43a7f74d61b 100644 --- a/exporter/exportertest/nop_exporter_test.go +++ b/exporter/exportertest/nop_exporter_test.go @@ -24,19 +24,19 @@ func TestNewNopFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &nopConfig{}, cfg) - traces, err := factory.CreateTracesExporter(context.Background(), NewNopCreateSettings(), cfg) + traces, err := factory.CreateTracesExporter(context.Background(), NewNopSettings(), cfg) require.NoError(t, err) assert.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, traces.ConsumeTraces(context.Background(), ptrace.NewTraces())) assert.NoError(t, traces.Shutdown(context.Background())) - metrics, err := factory.CreateMetricsExporter(context.Background(), NewNopCreateSettings(), cfg) + metrics, err := factory.CreateMetricsExporter(context.Background(), NewNopSettings(), cfg) require.NoError(t, err) assert.NoError(t, metrics.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, metrics.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) assert.NoError(t, metrics.Shutdown(context.Background())) - logs, err := factory.CreateLogsExporter(context.Background(), NewNopCreateSettings(), cfg) + logs, err := factory.CreateLogsExporter(context.Background(), NewNopSettings(), cfg) require.NoError(t, err) assert.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, logs.ConsumeLogs(context.Background(), plog.NewLogs())) @@ -49,7 +49,7 @@ func TestNewNopBuilder(t *testing.T) { factory := NewNopFactory() cfg := factory.CreateDefaultConfig() - set := NewNopCreateSettings() + set := NewNopSettings() set.ID = component.NewID(nopType) traces, err := factory.CreateTracesExporter(context.Background(), set, cfg) diff --git a/exporter/internal/common/factory.go b/exporter/internal/common/factory.go index 95eb888e819..b76e23f89c4 100644 --- a/exporter/internal/common/factory.go +++ b/exporter/internal/common/factory.go @@ -29,7 +29,7 @@ type Common struct { SamplingThereafter int } -func CreateTracesExporter(ctx context.Context, set exporter.CreateSettings, config component.Config, c *Common) (exporter.Traces, error) { +func CreateTracesExporter(ctx context.Context, set exporter.Settings, config component.Config, c *Common) (exporter.Traces, error) { exporterLogger := c.createLogger(set.TelemetrySettings.Logger) s := newLoggingExporter(exporterLogger, c.Verbosity) return exporterhelper.NewTracesExporter(ctx, set, config, @@ -40,7 +40,7 @@ func CreateTracesExporter(ctx context.Context, set exporter.CreateSettings, conf ) } -func CreateMetricsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config, c *Common) (exporter.Metrics, error) { +func CreateMetricsExporter(ctx context.Context, set exporter.Settings, config component.Config, c *Common) (exporter.Metrics, error) { exporterLogger := c.createLogger(set.TelemetrySettings.Logger) s := newLoggingExporter(exporterLogger, c.Verbosity) return exporterhelper.NewMetricsExporter(ctx, set, config, @@ -51,7 +51,7 @@ func CreateMetricsExporter(ctx context.Context, set exporter.CreateSettings, con ) } -func CreateLogsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config, c *Common) (exporter.Logs, error) { +func CreateLogsExporter(ctx context.Context, set exporter.Settings, config component.Config, c *Common) (exporter.Logs, error) { exporterLogger := c.createLogger(set.TelemetrySettings.Logger) s := newLoggingExporter(exporterLogger, c.Verbosity) return exporterhelper.NewLogsExporter(ctx, set, config, diff --git a/exporter/internal/common/factory_test.go b/exporter/internal/common/factory_test.go index a8bbc60607d..0509a4d91e3 100644 --- a/exporter/internal/common/factory_test.go +++ b/exporter/internal/common/factory_test.go @@ -18,19 +18,19 @@ func createDefaultConfig() component.Config { } func TestCreateMetricsExporter(t *testing.T) { - me, err := CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), createDefaultConfig(), &Common{}) + me, err := CreateMetricsExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig(), &Common{}) assert.NoError(t, err) assert.NotNil(t, me) } func TestCreateTracesExporter(t *testing.T) { - te, err := CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), createDefaultConfig(), &Common{}) + te, err := CreateTracesExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig(), &Common{}) assert.NoError(t, err) assert.NotNil(t, te) } func TestCreateLogsExporter(t *testing.T) { - te, err := CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), createDefaultConfig(), &Common{}) + te, err := CreateLogsExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig(), &Common{}) assert.NoError(t, err) assert.NotNil(t, te) } diff --git a/exporter/internal/common/logging_exporter_test.go b/exporter/internal/common/logging_exporter_test.go index 763f649daba..87414ad9bd1 100644 --- a/exporter/internal/common/logging_exporter_test.go +++ b/exporter/internal/common/logging_exporter_test.go @@ -20,7 +20,7 @@ import ( ) func TestLoggingTracesExporterNoErrors(t *testing.T) { - lte, err := CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), createDefaultConfig(), &Common{}) + lte, err := CreateTracesExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig(), &Common{}) require.NotNil(t, lte) assert.NoError(t, err) @@ -31,7 +31,7 @@ func TestLoggingTracesExporterNoErrors(t *testing.T) { } func TestLoggingMetricsExporterNoErrors(t *testing.T) { - lme, err := CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), createDefaultConfig(), &Common{}) + lme, err := CreateMetricsExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig(), &Common{}) require.NotNil(t, lme) assert.NoError(t, err) @@ -45,7 +45,7 @@ func TestLoggingMetricsExporterNoErrors(t *testing.T) { } func TestLoggingLogsExporterNoErrors(t *testing.T) { - lle, err := CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), createDefaultConfig(), &Common{}) + lle, err := CreateLogsExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig(), &Common{}) require.NotNil(t, lle) assert.NoError(t, err) diff --git a/exporter/internal/queue/persistent_queue.go b/exporter/internal/queue/persistent_queue.go index 07b0d1fb628..7dd646c6ef3 100644 --- a/exporter/internal/queue/persistent_queue.go +++ b/exporter/internal/queue/persistent_queue.go @@ -89,7 +89,7 @@ type PersistentQueueSettings[T any] struct { StorageID component.ID Marshaler func(req T) ([]byte, error) Unmarshaler func([]byte) (T, error) - ExporterSettings exporter.CreateSettings + ExporterSettings exporter.Settings } // NewPersistentQueue creates a new queue backed by file storage; name and signal must be a unique combination that identifies the queue storage diff --git a/exporter/internal/queue/persistent_queue_test.go b/exporter/internal/queue/persistent_queue_test.go index 6385088d5b1..ee3bc7b7c5f 100644 --- a/exporter/internal/queue/persistent_queue_test.go +++ b/exporter/internal/queue/persistent_queue_test.go @@ -63,7 +63,7 @@ func createAndStartTestPersistentQueue(t *testing.T, sizer Sizer[tracesRequest], StorageID: component.ID{}, Marshaler: marshalTracesRequest, Unmarshaler: unmarshalTracesRequest, - ExporterSettings: exportertest.NewNopCreateSettings(), + ExporterSettings: exportertest.NewNopSettings(), }) host := &mockHost{ext: map[component.ID]component.Component{ {}: NewMockStorageExtension(nil), @@ -84,7 +84,7 @@ func createTestPersistentQueueWithClient(client storage.Client) *persistentQueue StorageID: component.ID{}, Marshaler: marshalTracesRequest, Unmarshaler: unmarshalTracesRequest, - ExporterSettings: exportertest.NewNopCreateSettings(), + ExporterSettings: exportertest.NewNopSettings(), }).(*persistentQueue[tracesRequest]) pq.initClient(context.Background(), client) return pq @@ -107,7 +107,7 @@ func createTestPersistentQueueWithCapacityLimiter(t testing.TB, ext storage.Exte StorageID: component.ID{}, Marshaler: marshalTracesRequest, Unmarshaler: unmarshalTracesRequest, - ExporterSettings: exportertest.NewNopCreateSettings(), + ExporterSettings: exportertest.NewNopSettings(), }).(*persistentQueue[tracesRequest]) require.NoError(t, pq.Start(context.Background(), &mockHost{ext: map[component.ID]component.Component{{}: ext}})) return pq diff --git a/exporter/loggingexporter/factory.go b/exporter/loggingexporter/factory.go index 1f38b315db0..54f68e5bb74 100644 --- a/exporter/loggingexporter/factory.go +++ b/exporter/loggingexporter/factory.go @@ -43,7 +43,7 @@ func createDefaultConfig() component.Config { } } -func createTracesExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Traces, error) { +func createTracesExporter(ctx context.Context, set exporter.Settings, config component.Config) (exporter.Traces, error) { cfg := config.(*Config) return common.CreateTracesExporter(ctx, set, config, &common.Common{ Verbosity: cfg.Verbosity, @@ -54,7 +54,7 @@ func createTracesExporter(ctx context.Context, set exporter.CreateSettings, conf }) } -func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Metrics, error) { +func createMetricsExporter(ctx context.Context, set exporter.Settings, config component.Config) (exporter.Metrics, error) { cfg := config.(*Config) return common.CreateMetricsExporter(ctx, set, config, &common.Common{ Verbosity: cfg.Verbosity, @@ -65,7 +65,7 @@ func createMetricsExporter(ctx context.Context, set exporter.CreateSettings, con }) } -func createLogsExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Logs, error) { +func createLogsExporter(ctx context.Context, set exporter.Settings, config component.Config) (exporter.Logs, error) { cfg := config.(*Config) return common.CreateLogsExporter(ctx, set, config, &common.Common{ Verbosity: cfg.Verbosity, diff --git a/exporter/loggingexporter/factory_test.go b/exporter/loggingexporter/factory_test.go index f9a84a10863..173ee1ddd8c 100644 --- a/exporter/loggingexporter/factory_test.go +++ b/exporter/loggingexporter/factory_test.go @@ -24,7 +24,7 @@ func TestCreateMetricsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - me, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + me, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, me) } @@ -33,7 +33,7 @@ func TestCreateTracesExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - te, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + te, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, te) } @@ -42,7 +42,7 @@ func TestCreateLogsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - te, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + te, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, te) } diff --git a/exporter/loggingexporter/generated_component_test.go b/exporter/loggingexporter/generated_component_test.go index fc2245c31d8..06c2095963b 100644 --- a/exporter/loggingexporter/generated_component_test.go +++ b/exporter/loggingexporter/generated_component_test.go @@ -33,26 +33,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsExporter(ctx, set, cfg) }, }, { name: "metrics", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsExporter(ctx, set, cfg) }, }, { name: "traces", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesExporter(ctx, set, cfg) }, }, @@ -67,13 +67,13 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() err = c.Start(context.Background(), host) diff --git a/exporter/nopexporter/generated_component_test.go b/exporter/nopexporter/generated_component_test.go index 2b65f482fdf..8a25fd60d4b 100644 --- a/exporter/nopexporter/generated_component_test.go +++ b/exporter/nopexporter/generated_component_test.go @@ -33,26 +33,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsExporter(ctx, set, cfg) }, }, { name: "metrics", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsExporter(ctx, set, cfg) }, }, { name: "traces", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesExporter(ctx, set, cfg) }, }, @@ -67,13 +67,13 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() err = c.Start(context.Background(), host) diff --git a/exporter/nopexporter/nop_exporter.go b/exporter/nopexporter/nop_exporter.go index 16adf430cea..37ae67776c4 100644 --- a/exporter/nopexporter/nop_exporter.go +++ b/exporter/nopexporter/nop_exporter.go @@ -23,15 +23,15 @@ func NewFactory() exporter.Factory { ) } -func createTracesExporter(context.Context, exporter.CreateSettings, component.Config) (exporter.Traces, error) { +func createTracesExporter(context.Context, exporter.Settings, component.Config) (exporter.Traces, error) { return nopInstance, nil } -func createMetricsExporter(context.Context, exporter.CreateSettings, component.Config) (exporter.Metrics, error) { +func createMetricsExporter(context.Context, exporter.Settings, component.Config) (exporter.Metrics, error) { return nopInstance, nil } -func createLogsExporter(context.Context, exporter.CreateSettings, component.Config) (exporter.Logs, error) { +func createLogsExporter(context.Context, exporter.Settings, component.Config) (exporter.Logs, error) { return nopInstance, nil } diff --git a/exporter/nopexporter/nop_exporter_test.go b/exporter/nopexporter/nop_exporter_test.go index 80baefc9631..45661f02033 100644 --- a/exporter/nopexporter/nop_exporter_test.go +++ b/exporter/nopexporter/nop_exporter_test.go @@ -25,19 +25,19 @@ func TestNewNopFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &struct{}{}, cfg) - traces, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + traces, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) assert.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, traces.ConsumeTraces(context.Background(), ptrace.NewTraces())) assert.NoError(t, traces.Shutdown(context.Background())) - metrics, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + metrics, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) assert.NoError(t, metrics.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, metrics.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) assert.NoError(t, metrics.Shutdown(context.Background())) - logs, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + logs, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) assert.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, logs.ConsumeLogs(context.Background(), plog.NewLogs())) diff --git a/exporter/otlpexporter/factory.go b/exporter/otlpexporter/factory.go index 8a72aab8cdc..c06a6c605b2 100644 --- a/exporter/otlpexporter/factory.go +++ b/exporter/otlpexporter/factory.go @@ -45,7 +45,7 @@ func createDefaultConfig() component.Config { func createTracesExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, ) (exporter.Traces, error) { oce := newExporter(cfg, set) @@ -62,7 +62,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, ) (exporter.Metrics, error) { oce := newExporter(cfg, set) @@ -80,7 +80,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, ) (exporter.Logs, error) { oce := newExporter(cfg, set) diff --git a/exporter/otlpexporter/factory_test.go b/exporter/otlpexporter/factory_test.go index d89c8fe2ead..622fcdabcdb 100644 --- a/exporter/otlpexporter/factory_test.go +++ b/exporter/otlpexporter/factory_test.go @@ -41,7 +41,7 @@ func TestCreateMetricsExporter(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig.Endpoint = testutil.GetAvailableLocalAddress(t) - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() oexp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) require.Nil(t, err) require.NotNil(t, oexp) @@ -166,7 +166,7 @@ func TestCreateTracesExporter(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { factory := NewFactory() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() consumer, err := factory.CreateTracesExporter(context.Background(), set, tt.config) assert.NoError(t, err) assert.NotNil(t, consumer) @@ -192,7 +192,7 @@ func TestCreateLogsExporter(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig.Endpoint = testutil.GetAvailableLocalAddress(t) - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() oexp, err := factory.CreateLogsExporter(context.Background(), set, cfg) require.Nil(t, err) require.NotNil(t, oexp) diff --git a/exporter/otlpexporter/generated_component_test.go b/exporter/otlpexporter/generated_component_test.go index 7a410496a46..8d0fd821a76 100644 --- a/exporter/otlpexporter/generated_component_test.go +++ b/exporter/otlpexporter/generated_component_test.go @@ -33,26 +33,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsExporter(ctx, set, cfg) }, }, { name: "metrics", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsExporter(ctx, set, cfg) }, }, { name: "traces", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesExporter(ctx, set, cfg) }, }, @@ -67,13 +67,13 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() err = c.Start(context.Background(), host) diff --git a/exporter/otlpexporter/otlp.go b/exporter/otlpexporter/otlp.go index 21864d7723a..7de8c430b03 100644 --- a/exporter/otlpexporter/otlp.go +++ b/exporter/otlpexporter/otlp.go @@ -46,7 +46,7 @@ type baseExporter struct { userAgent string } -func newExporter(cfg component.Config, set exporter.CreateSettings) *baseExporter { +func newExporter(cfg component.Config, set exporter.Settings) *baseExporter { oCfg := cfg.(*Config) userAgent := fmt.Sprintf("%s/%s (%s/%s)", diff --git a/exporter/otlpexporter/otlp_test.go b/exporter/otlpexporter/otlp_test.go index 345c9cbf645..02d81fa2926 100644 --- a/exporter/otlpexporter/otlp_test.go +++ b/exporter/otlpexporter/otlp_test.go @@ -246,7 +246,7 @@ func TestSendTraces(t *testing.T) { "header": "header-value", }, } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() set.BuildInfo.Description = "Collector" set.BuildInfo.Version = "1.2.3test" @@ -365,7 +365,7 @@ func TestSendTracesWhenEndpointHasHttpScheme(t *testing.T) { if test.useTLS { cfg.ClientConfig.TLSSetting.InsecureSkipVerify = true } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := factory.CreateTracesExporter(context.Background(), set, cfg) require.NoError(t, err) require.NotNil(t, exp) @@ -418,7 +418,7 @@ func TestSendMetrics(t *testing.T) { "header": "header-value", }, } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() set.BuildInfo.Description = "Collector" set.BuildInfo.Version = "1.2.3test" @@ -523,7 +523,7 @@ func TestSendTraceDataServerDownAndUp(t *testing.T) { // Do not rely on external retry logic here, if that is intended set InitialInterval to 100ms. WaitForReady: true, } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := factory.CreateTracesExporter(context.Background(), set, cfg) require.NoError(t, err) require.NotNil(t, exp) @@ -580,7 +580,7 @@ func TestSendTraceDataServerStartWhileRequest(t *testing.T) { Insecure: true, }, } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := factory.CreateTracesExporter(context.Background(), set, cfg) require.NoError(t, err) require.NotNil(t, exp) @@ -631,7 +631,7 @@ func TestSendTracesOnResourceExhaustion(t *testing.T) { Insecure: true, }, } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := factory.CreateTracesExporter(context.Background(), set, cfg) require.NoError(t, err) require.NotNil(t, exp) @@ -712,7 +712,7 @@ func TestSendLogData(t *testing.T) { Insecure: true, }, } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() set.BuildInfo.Description = "Collector" set.BuildInfo.Version = "1.2.3test" diff --git a/exporter/otlphttpexporter/factory.go b/exporter/otlphttpexporter/factory.go index 9ebcc01fba1..96f7ed3c989 100644 --- a/exporter/otlphttpexporter/factory.go +++ b/exporter/otlphttpexporter/factory.go @@ -69,7 +69,7 @@ func composeSignalURL(oCfg *Config, signalOverrideURL string, signalName string) func createTracesExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, ) (exporter.Traces, error) { oce, err := newExporter(cfg, set) @@ -95,7 +95,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, ) (exporter.Metrics, error) { oce, err := newExporter(cfg, set) @@ -121,7 +121,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, - set exporter.CreateSettings, + set exporter.Settings, cfg component.Config, ) (exporter.Logs, error) { oce, err := newExporter(cfg, set) diff --git a/exporter/otlphttpexporter/factory_test.go b/exporter/otlphttpexporter/factory_test.go index d81b0c7bd55..ef00dfbe20d 100644 --- a/exporter/otlphttpexporter/factory_test.go +++ b/exporter/otlphttpexporter/factory_test.go @@ -44,7 +44,7 @@ func TestCreateMetricsExporter(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig.Endpoint = "http://" + testutil.GetAvailableLocalAddress(t) - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() oexp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) require.Nil(t, err) require.NotNil(t, oexp) @@ -174,7 +174,7 @@ func TestCreateTracesExporter(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { factory := NewFactory() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() consumer, err := factory.CreateTracesExporter(context.Background(), set, tt.config) if tt.mustFailOnCreate { @@ -203,7 +203,7 @@ func TestCreateLogsExporter(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig.Endpoint = "http://" + testutil.GetAvailableLocalAddress(t) - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() oexp, err := factory.CreateLogsExporter(context.Background(), set, cfg) require.Nil(t, err) require.NotNil(t, oexp) diff --git a/exporter/otlphttpexporter/generated_component_test.go b/exporter/otlphttpexporter/generated_component_test.go index c378698b41e..8c995ca1b34 100644 --- a/exporter/otlphttpexporter/generated_component_test.go +++ b/exporter/otlphttpexporter/generated_component_test.go @@ -33,26 +33,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsExporter(ctx, set, cfg) }, }, { name: "metrics", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsExporter(ctx, set, cfg) }, }, { name: "traces", - createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesExporter(ctx, set, cfg) }, }, @@ -67,13 +67,13 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() err = c.Start(context.Background(), host) diff --git a/exporter/otlphttpexporter/otlp.go b/exporter/otlphttpexporter/otlp.go index ea02be512f4..5c88b53c83f 100644 --- a/exporter/otlphttpexporter/otlp.go +++ b/exporter/otlphttpexporter/otlp.go @@ -54,7 +54,7 @@ const ( ) // Create new exporter. -func newExporter(cfg component.Config, set exporter.CreateSettings) (*baseExporter, error) { +func newExporter(cfg component.Config, set exporter.Settings) (*baseExporter, error) { oCfg := cfg.(*Config) if oCfg.Endpoint != "" { diff --git a/exporter/otlphttpexporter/otlp_test.go b/exporter/otlphttpexporter/otlp_test.go index e886e655482..f2fda5fa822 100644 --- a/exporter/otlphttpexporter/otlp_test.go +++ b/exporter/otlphttpexporter/otlp_test.go @@ -218,7 +218,7 @@ func TestErrorResponses(t *testing.T) { // Create without QueueSettings and RetryConfig so that ConsumeTraces // returns the errors that we want to check immediately. } - exp, err := createTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + exp, err := createTracesExporter(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) // start the exporter @@ -253,7 +253,7 @@ func TestErrorResponseInvalidResponseBody(t *testing.T) { } func TestUserAgent(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() set.BuildInfo.Description = "Collector" set.BuildInfo.Version = "1.2.3test" @@ -385,7 +385,7 @@ func TestUserAgent(t *testing.T) { func TestPartialSuccessInvalidBody(t *testing.T) { cfg := createDefaultConfig() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := newExporter(cfg, set) require.NoError(t, err) invalidBodyCases := []struct { @@ -415,7 +415,7 @@ func TestPartialSuccessInvalidBody(t *testing.T) { func TestPartialSuccessUnsupportedContentType(t *testing.T) { cfg := createDefaultConfig() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := newExporter(cfg, set) require.NoError(t, err) unsupportedContentTypeCases := []struct { @@ -473,7 +473,7 @@ func TestPartialSuccess_logs(t *testing.T) { LogsEndpoint: fmt.Sprintf("%s/v1/logs", srv.URL), ClientConfig: confighttp.ClientConfig{}, } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() logger, observed := observer.New(zap.DebugLevel) set.TelemetrySettings.Logger = zap.New(logger) @@ -498,7 +498,7 @@ func TestPartialSuccess_logs(t *testing.T) { func TestPartialResponse_missingHeaderButHasBody(t *testing.T) { cfg := createDefaultConfig() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := newExporter(cfg, set) require.NoError(t, err) @@ -566,7 +566,7 @@ func TestPartialResponse_missingHeaderButHasBody(t *testing.T) { func TestPartialResponse_missingHeaderAndBody(t *testing.T) { cfg := createDefaultConfig() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := newExporter(cfg, set) require.NoError(t, err) @@ -615,7 +615,7 @@ func TestPartialResponse_missingHeaderAndBody(t *testing.T) { func TestPartialResponse_nonErrUnexpectedEOFError(t *testing.T) { cfg := createDefaultConfig() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := newExporter(cfg, set) require.NoError(t, err) @@ -630,7 +630,7 @@ func TestPartialResponse_nonErrUnexpectedEOFError(t *testing.T) { func TestPartialSuccess_shortContentLengthHeader(t *testing.T) { cfg := createDefaultConfig() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := newExporter(cfg, set) require.NoError(t, err) @@ -726,7 +726,7 @@ func TestPartialSuccess_longContentLengthHeader(t *testing.T) { for _, tt := range telemetryTypes { t.Run(tt.telemetryType+" "+ct.contentType, func(t *testing.T) { cfg := createDefaultConfig() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() logger, observed := observer.New(zap.DebugLevel) set.TelemetrySettings.Logger = zap.New(logger) exp, err := newExporter(cfg, set) @@ -779,7 +779,7 @@ func TestPartialSuccess_longContentLengthHeader(t *testing.T) { func TestPartialSuccessInvalidResponseBody(t *testing.T) { cfg := createDefaultConfig() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() exp, err := newExporter(cfg, set) require.NoError(t, err) @@ -813,7 +813,7 @@ func TestPartialSuccess_traces(t *testing.T) { TracesEndpoint: fmt.Sprintf("%s/v1/traces", srv.URL), ClientConfig: confighttp.ClientConfig{}, } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() logger, observed := observer.New(zap.DebugLevel) set.TelemetrySettings.Logger = zap.New(logger) exp, err := createTracesExporter(context.Background(), set, cfg) @@ -853,7 +853,7 @@ func TestPartialSuccess_metrics(t *testing.T) { MetricsEndpoint: fmt.Sprintf("%s/v1/metrics", srv.URL), ClientConfig: confighttp.ClientConfig{}, } - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() logger, observed := observer.New(zap.DebugLevel) set.TelemetrySettings.Logger = zap.New(logger) exp, err := createMetricsExporter(context.Background(), set, cfg) @@ -875,7 +875,7 @@ func TestPartialSuccess_metrics(t *testing.T) { } func TestEncoding(t *testing.T) { - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() set.BuildInfo.Description = "Collector" set.BuildInfo.Version = "1.2.3test" diff --git a/internal/e2e/otlphttp_test.go b/internal/e2e/otlphttp_test.go index 3c2f41ffc15..e5f7a0c430f 100644 --- a/internal/e2e/otlphttp_test.go +++ b/internal/e2e/otlphttp_test.go @@ -43,7 +43,7 @@ func TestInvalidConfig(t *testing.T) { }, } f := otlphttpexporter.NewFactory() - set := exportertest.NewNopCreateSettings() + set := exportertest.NewNopSettings() _, err := f.CreateTracesExporter(context.Background(), set, config) require.Error(t, err) _, err = f.CreateMetricsExporter(context.Background(), set, config) @@ -291,7 +291,7 @@ func startTracesExporter(t *testing.T, baseURL string, overrideURL string) expor factory := otlphttpexporter.NewFactory() cfg := createExporterConfig(baseURL, factory.CreateDefaultConfig()) cfg.TracesEndpoint = overrideURL - exp, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + exp, err := factory.CreateTracesExporter(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) startAndCleanup(t, exp) return exp @@ -301,7 +301,7 @@ func startMetricsExporter(t *testing.T, baseURL string, overrideURL string) expo factory := otlphttpexporter.NewFactory() cfg := createExporterConfig(baseURL, factory.CreateDefaultConfig()) cfg.MetricsEndpoint = overrideURL - exp, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + exp, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) startAndCleanup(t, exp) return exp @@ -311,7 +311,7 @@ func startLogsExporter(t *testing.T, baseURL string, overrideURL string) exporte factory := otlphttpexporter.NewFactory() cfg := createExporterConfig(baseURL, factory.CreateDefaultConfig()) cfg.LogsEndpoint = overrideURL - exp, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + exp, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopSettings(), cfg) require.NoError(t, err) startAndCleanup(t, exp) return exp diff --git a/service/internal/graph/graph_test.go b/service/internal/graph/graph_test.go index c93a0db5771..642b2082bfc 100644 --- a/service/internal/graph/graph_test.go +++ b/service/internal/graph/graph_test.go @@ -2486,13 +2486,13 @@ func newErrProcessorFactory() processor.Factory { func newErrExporterFactory() exporter.Factory { return exporter.NewFactory(component.MustNewType("err"), func() component.Config { return &struct{}{} }, - exporter.WithTraces(func(context.Context, exporter.CreateSettings, component.Config) (exporter.Traces, error) { + exporter.WithTraces(func(context.Context, exporter.Settings, component.Config) (exporter.Traces, error) { return &errComponent{}, nil }, component.StabilityLevelUndefined), - exporter.WithLogs(func(context.Context, exporter.CreateSettings, component.Config) (exporter.Logs, error) { + exporter.WithLogs(func(context.Context, exporter.Settings, component.Config) (exporter.Logs, error) { return &errComponent{}, nil }, component.StabilityLevelUndefined), - exporter.WithMetrics(func(context.Context, exporter.CreateSettings, component.Config) (exporter.Metrics, error) { + exporter.WithMetrics(func(context.Context, exporter.Settings, component.Config) (exporter.Metrics, error) { return &errComponent{}, nil }, component.StabilityLevelUndefined), ) diff --git a/service/internal/graph/nodes.go b/service/internal/graph/nodes.go index 757e52c09bc..4136fc3c538 100644 --- a/service/internal/graph/nodes.go +++ b/service/internal/graph/nodes.go @@ -181,7 +181,7 @@ func (n *exporterNode) buildComponent( info component.BuildInfo, builder *exporter.Builder, ) error { - set := exporter.CreateSettings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info} + set := exporter.Settings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info} set.TelemetrySettings.Logger = components.ExporterLogger(set.TelemetrySettings.Logger, n.componentID, n.pipelineType) var err error switch n.pipelineType { diff --git a/service/internal/testcomponents/example_exporter.go b/service/internal/testcomponents/example_exporter.go index 653a2ad4a47..388ee81b106 100644 --- a/service/internal/testcomponents/example_exporter.go +++ b/service/internal/testcomponents/example_exporter.go @@ -31,15 +31,15 @@ func createExporterDefaultConfig() component.Config { return &struct{}{} } -func createTracesExporter(context.Context, exporter.CreateSettings, component.Config) (exporter.Traces, error) { +func createTracesExporter(context.Context, exporter.Settings, component.Config) (exporter.Traces, error) { return &ExampleExporter{}, nil } -func createMetricsExporter(context.Context, exporter.CreateSettings, component.Config) (exporter.Metrics, error) { +func createMetricsExporter(context.Context, exporter.Settings, component.Config) (exporter.Metrics, error) { return &ExampleExporter{}, nil } -func createLogsExporter(context.Context, exporter.CreateSettings, component.Config) (exporter.Logs, error) { +func createLogsExporter(context.Context, exporter.Settings, component.Config) (exporter.Logs, error) { return &ExampleExporter{}, nil } From b6bdc4ee5b6736f9eaa77ab45e3831ccf3e40024 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 6 Jun 2024 08:04:30 -0700 Subject: [PATCH 041/168] [chore] fix some typos and a use of deprecated Go API (#10347) --- component/component.go | 10 +++++----- component/config.go | 2 +- component/host.go | 2 +- component/telemetry.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/component/component.go b/component/component.go index 794fc9235a9..f5f68b57290 100644 --- a/component/component.go +++ b/component/component.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -// Package component outlines the abstraction of components within the OpenTelemetry Collector. It provides details on the component +// Package component outlines the abstraction of components within the OpenTelemetry Collector. It provides details on the component // lifecycle as well as defining the interface that components must fulfill. package component // import "go.opentelemetry.io/collector/component" @@ -11,12 +11,12 @@ import ( ) var ( - // ErrDataTypeIsNotSupported can be returned by receiver, exporter or processor factory funcs that create the - // Component if the particular telemetry data type is not supported by the receiver, exporter or processor. + // ErrDataTypeIsNotSupported can be returned by receiver, exporter, processor or connector factory funcs that create the + // Component if the particular telemetry data type is not supported by the receiver, exporter, processor or connector factory. ErrDataTypeIsNotSupported = errors.New("telemetry type is not supported") ) -// Component is either a receiver, exporter, processor, or an extension. +// Component is either a receiver, exporter, processor, connector, or an extension. // // A component's lifecycle has the following phases: // @@ -174,7 +174,7 @@ type Factory interface { // CreateDefaultConfig creates the default configuration for the Component. // This method can be called multiple times depending on the pipeline - // configuration and should not cause side-effects that prevent the creation + // configuration and should not cause side effects that prevent the creation // of multiple instances of the Component. // The object returned by this method needs to pass the checks implemented by // 'componenttest.CheckConfigStruct'. It is recommended to have these checks in the diff --git a/component/config.go b/component/config.go index b53ff872fda..6d4dbea1c32 100644 --- a/component/config.go +++ b/component/config.go @@ -91,7 +91,7 @@ func callValidateIfPossible(v reflect.Value) error { } // If the pointer type implements ConfigValidator call Validate on the pointer to the current value. - if reflect.PtrTo(v.Type()).Implements(configValidatorType) { + if reflect.PointerTo(v.Type()).Implements(configValidatorType) { // If not addressable, then create a new *V pointer and set the value to current v. if !v.CanAddr() { pv := reflect.New(reflect.PtrTo(v.Type()).Elem()) diff --git a/component/host.go b/component/host.go index 50472a6d88c..4c98ee70f96 100644 --- a/component/host.go +++ b/component/host.go @@ -20,7 +20,7 @@ type Host interface { GetFactory(kind Kind, componentType Type) Factory // GetExtensions returns the map of extensions. Only enabled and created extensions will be returned. - // Typically is used to find an extension by type or by full config name. Both cases + // Typically, it is used to find an extension by type or by full config name. Both cases // can be done by iterating the returned map. There are typically very few extensions, // so there are no performance implications due to iteration. // diff --git a/component/telemetry.go b/component/telemetry.go index 17ca3dcab67..29f9a21698a 100644 --- a/component/telemetry.go +++ b/component/telemetry.go @@ -15,8 +15,8 @@ import ( // TelemetrySettings provides components with APIs to report telemetry. // // Note: there is a service version of this struct, servicetelemetry.TelemetrySettings, that mirrors -// this struct with the exception of ReportStatus. When adding or removing anything from -// this struct consider whether or not the same should be done for the service version. +// this struct except ReportStatus. When adding or removing anything from +// this struct consider whether the same should be done for the service version. type TelemetrySettings struct { // Logger that the factory can use during creation and can pass to the created // component to be used later as well. From 4f6953976ab7bfb2b070a2135488fa2ace5da162 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 6 Jun 2024 08:04:52 -0700 Subject: [PATCH 042/168] [chore] fix typos (#10345) --- exporter/otlpexporter/otlp.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/exporter/otlpexporter/otlp.go b/exporter/otlpexporter/otlp.go index 7de8c430b03..b8d6dee2a75 100644 --- a/exporter/otlpexporter/otlp.go +++ b/exporter/otlpexporter/otlp.go @@ -151,8 +151,7 @@ func processError(err error) error { return nil } - // Now, this is this a real error. - + // Now, this is a real error. retryInfo := getRetryInfo(st) if !shouldRetry(st.Code(), retryInfo) { @@ -168,7 +167,6 @@ func processError(err error) error { } // Need to retry. - return err } From 88acdf020d8771a143ad0db1d948b02b660bbe14 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Thu, 6 Jun 2024 17:50:43 +0200 Subject: [PATCH 043/168] [exporter/debug] disable sampling by default (#10250) #### Description Disables sampling by default in the Debug exporter. #### Link to tracking issue - https://github.com/open-telemetry/opentelemetry-collector/issues/9921 #### Testing No changes. #### Documentation Updated component documentation. --- .../debug-exporter-disable-sampling.yaml | 25 +++++++++++++++++++ exporter/debugexporter/README.md | 10 +++++--- exporter/debugexporter/factory.go | 2 +- 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 .chloggen/debug-exporter-disable-sampling.yaml diff --git a/.chloggen/debug-exporter-disable-sampling.yaml b/.chloggen/debug-exporter-disable-sampling.yaml new file mode 100644 index 00000000000..fa45ec9ab5a --- /dev/null +++ b/.chloggen/debug-exporter-disable-sampling.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporter/debug + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Disable sampling by default + +# One or more tracking issues or pull requests related to the change +issues: [9921] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: To restore the behavior that was previously the default, set `sampling_thereafter` to `500`. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/debugexporter/README.md b/exporter/debugexporter/README.md index 618e12b1d13..344c55c3515 100644 --- a/exporter/debugexporter/README.md +++ b/exporter/debugexporter/README.md @@ -28,9 +28,11 @@ The following settings are optional: logged. - `sampling_initial` (default = `2`): number of messages initially logged each second. -- `sampling_thereafter` (default = `500`): sampling rate after the initial - messages are logged (every Mth message is logged). Refer to [Zap - docs](https://godoc.org/go.uber.org/zap/zapcore#NewSampler) for more details. +- `sampling_thereafter` (default = `1`): sampling rate after the initial + messages are logged (every Mth message is logged). + The default value of `1` means that sampling is disabled. + To enable sampling, change `sampling_thereafter` to a value higher than `1`. + Refer to [Zap docs](https://godoc.org/go.uber.org/zap/zapcore#NewSampler) for more details on how sampling parameters impact number of messages. Example configuration: @@ -109,4 +111,4 @@ Attributes: ## Warnings -- Unstable Output Format: The output formats for all verbosity levels is not guaranteed and may be changed at any time without a breaking change. \ No newline at end of file +- Unstable Output Format: The output formats for all verbosity levels is not guaranteed and may be changed at any time without a breaking change. diff --git a/exporter/debugexporter/factory.go b/exporter/debugexporter/factory.go index 5a61da417dc..0d4ee05ae0a 100644 --- a/exporter/debugexporter/factory.go +++ b/exporter/debugexporter/factory.go @@ -24,7 +24,7 @@ var componentType = component.MustNewType("debug") const ( defaultSamplingInitial = 2 - defaultSamplingThereafter = 500 + defaultSamplingThereafter = 1 ) // NewFactory creates a factory for Debug exporter From 9907ba50df0d5853c34d2962cf21da42e15a560d Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:34:53 -0700 Subject: [PATCH 044/168] [processor] deprecate CreateSettings -> Settings (#10336) This deprecates CreateSettings in favour of Settings. NewNopCreateSettings is also being deprecated in favour of NewNopSettings Part of #9428 --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_create-settings-processor.yaml | 28 +++++++++++++ .../component_telemetry_test.go.tmpl | 2 +- cmd/mdatagen/templates/component_test.go.tmpl | 12 +++--- processor/batchprocessor/batch_processor.go | 8 ++-- .../batchprocessor/batch_processor_test.go | 42 +++++++++---------- processor/batchprocessor/factory.go | 6 +-- processor/batchprocessor/factory_test.go | 2 +- .../generated_component_telemetry_test.go | 4 +- .../generated_component_test.go | 12 +++--- processor/batchprocessor/metrics.go | 2 +- processor/memorylimiterprocessor/factory.go | 8 ++-- .../memorylimiterprocessor/factory_test.go | 6 +-- .../generated_component_test.go | 10 ++--- .../memorylimiterprocessor/memorylimiter.go | 2 +- .../memorylimiter_test.go | 16 +++---- processor/processor.go | 31 ++++++++------ processor/processor_test.go | 22 +++++----- .../generated_component_telemetry_test.go | 4 +- processor/processorhelper/logs.go | 2 +- processor/processorhelper/logs_test.go | 10 ++--- processor/processorhelper/metrics.go | 2 +- processor/processorhelper/metrics_test.go | 10 ++--- processor/processorhelper/obsreport.go | 2 +- processor/processorhelper/obsreport_test.go | 18 ++++---- processor/processorhelper/traces.go | 2 +- processor/processorhelper/traces_test.go | 10 ++--- processor/processortest/nop_processor.go | 17 +++++--- processor/processortest/nop_processor_test.go | 8 ++-- processor/processortest/shutdown_verifier.go | 6 +-- .../processortest/shutdown_verifier_test.go | 6 +-- .../processortest/unhealthy_processor.go | 10 ++--- service/internal/graph/graph_test.go | 6 +-- service/internal/graph/nodes.go | 2 +- .../testcomponents/example_processor.go | 6 +-- 34 files changed, 187 insertions(+), 147 deletions(-) create mode 100644 .chloggen/codeboten_create-settings-processor.yaml diff --git a/.chloggen/codeboten_create-settings-processor.yaml b/.chloggen/codeboten_create-settings-processor.yaml new file mode 100644 index 00000000000..6d4ec095c26 --- /dev/null +++ b/.chloggen/codeboten_create-settings-processor.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: processor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate CreateSettings and NewNopCreateSettings + +# One or more tracking issues or pull requests related to the change +issues: [9428] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The following methods are being renamed: + - processor.CreateSettings -> processor.Settings + - processor.NewNopCreateSettings -> processor.NewNopSettings + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl index 3c3f06140fa..48ab711622a 100644 --- a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl +++ b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl @@ -21,7 +21,7 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -{{- if (or isExporter isReceiver) }} +{{- if (or isExporter isReceiver isProcessor) }} func (tt *componentTestTelemetry) NewSettings() {{ .Status.Class }}.Settings { settings := {{ .Status.Class }}test.NewNopSettings() settings.MeterProvider = tt.meterProvider diff --git a/cmd/mdatagen/templates/component_test.go.tmpl b/cmd/mdatagen/templates/component_test.go.tmpl index 767d9acfacc..ef277d2ea4a 100644 --- a/cmd/mdatagen/templates/component_test.go.tmpl +++ b/cmd/mdatagen/templates/component_test.go.tmpl @@ -166,12 +166,12 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct{ name string - createFn func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) }{ {{ if supportsLogs }} { name: "logs", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsProcessor(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -179,7 +179,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsMetrics }} { name: "metrics", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsProcessor(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -187,7 +187,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsTraces }} { name: "traces", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesProcessor(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -204,7 +204,7 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { {{- if not .Tests.SkipShutdown }} t.Run(test.name + "-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), processortest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), processortest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) @@ -213,7 +213,7 @@ func TestComponentLifecycle(t *testing.T) { {{- if not .Tests.SkipLifecycle }} t.Run(test.name + "-lifecycle", func(t *testing.T) { - c, err := test.createFn(context.Background(), processortest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), processortest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() err = c.Start(context.Background(), host) diff --git a/processor/batchprocessor/batch_processor.go b/processor/batchprocessor/batch_processor.go index 60c6fa10ef6..4af8eaab42f 100644 --- a/processor/batchprocessor/batch_processor.go +++ b/processor/batchprocessor/batch_processor.go @@ -110,7 +110,7 @@ var _ consumer.Metrics = (*batchProcessor)(nil) var _ consumer.Logs = (*batchProcessor)(nil) // newBatchProcessor returns a new batch processor component. -func newBatchProcessor(set processor.CreateSettings, cfg *Config, batchFunc func() batch) (*batchProcessor, error) { +func newBatchProcessor(set processor.Settings, cfg *Config, batchFunc func() batch) (*batchProcessor, error) { // use lower-case, to be consistent with http/2 headers. mks := make([]string, len(cfg.MetadataKeys)) for i, k := range cfg.MetadataKeys { @@ -357,17 +357,17 @@ func (bp *batchProcessor) ConsumeLogs(ctx context.Context, ld plog.Logs) error { } // newBatchTracesProcessor creates a new batch processor that batches traces by size or with timeout -func newBatchTracesProcessor(set processor.CreateSettings, next consumer.Traces, cfg *Config) (*batchProcessor, error) { +func newBatchTracesProcessor(set processor.Settings, next consumer.Traces, cfg *Config) (*batchProcessor, error) { return newBatchProcessor(set, cfg, func() batch { return newBatchTraces(next) }) } // newBatchMetricsProcessor creates a new batch processor that batches metrics by size or with timeout -func newBatchMetricsProcessor(set processor.CreateSettings, next consumer.Metrics, cfg *Config) (*batchProcessor, error) { +func newBatchMetricsProcessor(set processor.Settings, next consumer.Metrics, cfg *Config) (*batchProcessor, error) { return newBatchProcessor(set, cfg, func() batch { return newBatchMetrics(next) }) } // newBatchLogsProcessor creates a new batch processor that batches logs by size or with timeout -func newBatchLogsProcessor(set processor.CreateSettings, next consumer.Logs, cfg *Config) (*batchProcessor, error) { +func newBatchLogsProcessor(set processor.Settings, next consumer.Logs, cfg *Config) (*batchProcessor, error) { return newBatchProcessor(set, cfg, func() batch { return newBatchLogs(next) }) } diff --git a/processor/batchprocessor/batch_processor_test.go b/processor/batchprocessor/batch_processor_test.go index 2cb189c13c3..509b9eedcbd 100644 --- a/processor/batchprocessor/batch_processor_test.go +++ b/processor/batchprocessor/batch_processor_test.go @@ -33,7 +33,7 @@ func TestProcessorShutdown(t *testing.T) { factory := NewFactory() ctx := context.Background() - processorCreationSet := processortest.NewNopCreateSettings() + processorCreationSet := processortest.NewNopSettings() for i := 0; i < 5; i++ { require.NotPanics(t, func() { @@ -60,7 +60,7 @@ func TestProcessorLifecycle(t *testing.T) { factory := NewFactory() ctx := context.Background() - processorCreationSet := processortest.NewNopCreateSettings() + processorCreationSet := processortest.NewNopSettings() for i := 0; i < 5; i++ { tProc, err := factory.CreateTracesProcessor(ctx, processorCreationSet, factory.CreateDefaultConfig(), consumertest.NewNop()) @@ -84,7 +84,7 @@ func TestBatchProcessorSpansDelivered(t *testing.T) { sink := new(consumertest.TracesSink) cfg := createDefaultConfig().(*Config) cfg.SendBatchSize = 128 - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchTracesProcessor(creationSet, sink, cfg) require.NoError(t, err) @@ -127,7 +127,7 @@ func TestBatchProcessorSpansDeliveredEnforceBatchSize(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.SendBatchSize = 128 cfg.SendBatchMaxSize = 130 - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchTracesProcessor(creationSet, sink, cfg) require.NoError(t, err) @@ -174,7 +174,7 @@ func TestBatchProcessorSentBySize(t *testing.T) { sendBatchSize := 20 cfg.SendBatchSize = uint32(sendBatchSize) cfg.Timeout = 500 * time.Millisecond - creationSet := tel.NewCreateSettings() + creationSet := tel.NewSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchTracesProcessor(creationSet, sink, cfg) require.NoError(t, err) @@ -295,7 +295,7 @@ func TestBatchProcessorSentBySizeWithMaxSize(t *testing.T) { cfg.SendBatchSize = uint32(sendBatchSize) cfg.SendBatchMaxSize = uint32(sendBatchMaxSize) cfg.Timeout = 500 * time.Millisecond - creationSet := tel.NewCreateSettings() + creationSet := tel.NewSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchTracesProcessor(creationSet, sink, cfg) require.NoError(t, err) @@ -437,7 +437,7 @@ func TestBatchProcessorSentByTimeout(t *testing.T) { spansPerRequest := 10 start := time.Now() - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchTracesProcessor(creationSet, sink, cfg) require.NoError(t, err) @@ -484,7 +484,7 @@ func TestBatchProcessorTraceSendWhenClosing(t *testing.T) { } sink := new(consumertest.TracesSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchTracesProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -515,7 +515,7 @@ func TestBatchMetricProcessor_ReceivingData(t *testing.T) { metricsPerRequest := 5 sink := new(consumertest.MetricsSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchMetricsProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -569,7 +569,7 @@ func TestBatchMetricProcessorBatchSize(t *testing.T) { dataPointsPerRequest := metricsPerRequest * dataPointsPerMetric sink := new(consumertest.MetricsSink) - creationSet := tel.NewCreateSettings() + creationSet := tel.NewSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchMetricsProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -702,7 +702,7 @@ func TestBatchMetricsProcessor_Timeout(t *testing.T) { metricsPerRequest := 10 sink := new(consumertest.MetricsSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchMetricsProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -751,7 +751,7 @@ func TestBatchMetricProcessor_Shutdown(t *testing.T) { metricsPerRequest := 10 sink := new(consumertest.MetricsSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchMetricsProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -849,7 +849,7 @@ func BenchmarkMultiBatchMetricProcessor(b *testing.B) { func runMetricsProcessorBenchmark(b *testing.B, cfg Config) { ctx := context.Background() sink := new(metricsSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed metricsPerRequest := 1000 batcher, err := newBatchMetricsProcessor(creationSet, sink, &cfg) @@ -897,7 +897,7 @@ func TestBatchLogProcessor_ReceivingData(t *testing.T) { logsPerRequest := 5 sink := new(consumertest.LogsSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchLogsProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -949,7 +949,7 @@ func TestBatchLogProcessor_BatchSize(t *testing.T) { logsPerRequest := 5 sink := new(consumertest.LogsSink) - creationSet := tel.NewCreateSettings() + creationSet := tel.NewSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchLogsProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -1063,7 +1063,7 @@ func TestBatchLogsProcessor_Timeout(t *testing.T) { logsPerRequest := 10 sink := new(consumertest.LogsSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchLogsProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -1112,7 +1112,7 @@ func TestBatchLogProcessor_Shutdown(t *testing.T) { logsPerRequest := 10 sink := new(consumertest.LogsSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchLogsProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -1191,7 +1191,7 @@ func TestBatchProcessorSpansBatchedByMetadata(t *testing.T) { cfg.SendBatchSize = 1000 cfg.Timeout = 10 * time.Minute cfg.MetadataKeys = []string{"token1", "token2"} - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchTracesProcessor(creationSet, sink, cfg) require.NoError(t, err) @@ -1285,7 +1285,7 @@ func TestBatchProcessorMetadataCardinalityLimit(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.MetadataKeys = []string{"token"} cfg.MetadataCardinalityLimit = cardLimit - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() batcher, err := newBatchTracesProcessor(creationSet, sink, cfg) require.NoError(t, err) require.NoError(t, batcher.Start(context.Background(), componenttest.NewNopHost())) @@ -1327,7 +1327,7 @@ func TestBatchZeroConfig(t *testing.T) { const requestCount = 5 const logsPerRequest = 10 sink := new(consumertest.LogsSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchLogsProcessor(creationSet, sink, &cfg) require.NoError(t, err) @@ -1368,7 +1368,7 @@ func TestBatchSplitOnly(t *testing.T) { require.NoError(t, cfg.Validate()) sink := new(consumertest.LogsSink) - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() creationSet.MetricsLevel = configtelemetry.LevelDetailed batcher, err := newBatchLogsProcessor(creationSet, sink, &cfg) require.NoError(t, err) diff --git a/processor/batchprocessor/factory.go b/processor/batchprocessor/factory.go index 3af85a816cc..12fcbb9e6ab 100644 --- a/processor/batchprocessor/factory.go +++ b/processor/batchprocessor/factory.go @@ -45,7 +45,7 @@ func createDefaultConfig() component.Config { func createTraces( _ context.Context, - set processor.CreateSettings, + set processor.Settings, cfg component.Config, nextConsumer consumer.Traces, ) (processor.Traces, error) { @@ -54,7 +54,7 @@ func createTraces( func createMetrics( _ context.Context, - set processor.CreateSettings, + set processor.Settings, cfg component.Config, nextConsumer consumer.Metrics, ) (processor.Metrics, error) { @@ -63,7 +63,7 @@ func createMetrics( func createLogs( _ context.Context, - set processor.CreateSettings, + set processor.Settings, cfg component.Config, nextConsumer consumer.Logs, ) (processor.Logs, error) { diff --git a/processor/batchprocessor/factory_test.go b/processor/batchprocessor/factory_test.go index 83371f0c1f1..6dbc3af13da 100644 --- a/processor/batchprocessor/factory_test.go +++ b/processor/batchprocessor/factory_test.go @@ -25,7 +25,7 @@ func TestCreateProcessor(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - creationSet := processortest.NewNopCreateSettings() + creationSet := processortest.NewNopSettings() tp, err := factory.CreateTracesProcessor(context.Background(), creationSet, cfg, nil) assert.NotNil(t, tp) assert.NoError(t, err, "cannot create trace processor") diff --git a/processor/batchprocessor/generated_component_telemetry_test.go b/processor/batchprocessor/generated_component_telemetry_test.go index 425cd854d90..640256a9a49 100644 --- a/processor/batchprocessor/generated_component_telemetry_test.go +++ b/processor/batchprocessor/generated_component_telemetry_test.go @@ -21,8 +21,8 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -func (tt *componentTestTelemetry) NewCreateSettings() processor.CreateSettings { - settings := processortest.NewNopCreateSettings() +func (tt *componentTestTelemetry) NewSettings() processor.Settings { + settings := processortest.NewNopSettings() settings.MeterProvider = tt.meterProvider settings.ID = component.NewID(component.MustNewType("batch")) diff --git a/processor/batchprocessor/generated_component_test.go b/processor/batchprocessor/generated_component_test.go index 0e6c4960b89..af68a5bf9a8 100644 --- a/processor/batchprocessor/generated_component_test.go +++ b/processor/batchprocessor/generated_component_test.go @@ -34,26 +34,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsProcessor(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "metrics", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsProcessor(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "traces", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesProcessor(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -68,13 +68,13 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), processortest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), processortest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - c, err := test.createFn(context.Background(), processortest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), processortest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() err = c.Start(context.Background(), host) diff --git a/processor/batchprocessor/metrics.go b/processor/batchprocessor/metrics.go index 2aecaeeddc7..228e5668e51 100644 --- a/processor/batchprocessor/metrics.go +++ b/processor/batchprocessor/metrics.go @@ -32,7 +32,7 @@ type batchProcessorTelemetry struct { telemetryBuilder *metadata.TelemetryBuilder } -func newBatchProcessorTelemetry(set processor.CreateSettings, currentMetadataCardinality func() int) (*batchProcessorTelemetry, error) { +func newBatchProcessorTelemetry(set processor.Settings, currentMetadataCardinality func() int) (*batchProcessorTelemetry, error) { attrs := attribute.NewSet(attribute.String(obsmetrics.ProcessorKey, set.ID.String())) telemetryBuilder, err := metadata.NewTelemetryBuilder(set.TelemetrySettings, diff --git a/processor/memorylimiterprocessor/factory.go b/processor/memorylimiterprocessor/factory.go index 67ae80c996b..c64f401624a 100644 --- a/processor/memorylimiterprocessor/factory.go +++ b/processor/memorylimiterprocessor/factory.go @@ -46,7 +46,7 @@ func createDefaultConfig() component.Config { func (f *factory) createTracesProcessor( ctx context.Context, - set processor.CreateSettings, + set processor.Settings, cfg component.Config, nextConsumer consumer.Traces, ) (processor.Traces, error) { @@ -63,7 +63,7 @@ func (f *factory) createTracesProcessor( func (f *factory) createMetricsProcessor( ctx context.Context, - set processor.CreateSettings, + set processor.Settings, cfg component.Config, nextConsumer consumer.Metrics, ) (processor.Metrics, error) { @@ -80,7 +80,7 @@ func (f *factory) createMetricsProcessor( func (f *factory) createLogsProcessor( ctx context.Context, - set processor.CreateSettings, + set processor.Settings, cfg component.Config, nextConsumer consumer.Logs, ) (processor.Logs, error) { @@ -97,7 +97,7 @@ func (f *factory) createLogsProcessor( // getMemoryLimiter checks if we have a cached memoryLimiter with a specific config, // otherwise initialize and add one to the store. -func (f *factory) getMemoryLimiter(set processor.CreateSettings, cfg component.Config) (*memoryLimiterProcessor, error) { +func (f *factory) getMemoryLimiter(set processor.Settings, cfg component.Config) (*memoryLimiterProcessor, error) { f.lock.Lock() defer f.lock.Unlock() diff --git a/processor/memorylimiterprocessor/factory_test.go b/processor/memorylimiterprocessor/factory_test.go index b8cca4c6d20..f63d27a381e 100644 --- a/processor/memorylimiterprocessor/factory_test.go +++ b/processor/memorylimiterprocessor/factory_test.go @@ -38,19 +38,19 @@ func TestCreateProcessor(t *testing.T) { pCfg.MemorySpikeLimitMiB = 1907 pCfg.CheckInterval = 100 * time.Millisecond - tp, err := factory.CreateTracesProcessor(context.Background(), processortest.NewNopCreateSettings(), cfg, consumertest.NewNop()) + tp, err := factory.CreateTracesProcessor(context.Background(), processortest.NewNopSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tp) // test if we can shutdown a monitoring routine that has not started assert.ErrorIs(t, tp.Shutdown(context.Background()), memorylimiter.ErrShutdownNotStarted) assert.NoError(t, tp.Start(context.Background(), componenttest.NewNopHost())) - mp, err := factory.CreateMetricsProcessor(context.Background(), processortest.NewNopCreateSettings(), cfg, consumertest.NewNop()) + mp, err := factory.CreateMetricsProcessor(context.Background(), processortest.NewNopSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, mp) assert.NoError(t, mp.Start(context.Background(), componenttest.NewNopHost())) - lp, err := factory.CreateLogsProcessor(context.Background(), processortest.NewNopCreateSettings(), cfg, consumertest.NewNop()) + lp, err := factory.CreateLogsProcessor(context.Background(), processortest.NewNopSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, lp) assert.NoError(t, lp.Start(context.Background(), componenttest.NewNopHost())) diff --git a/processor/memorylimiterprocessor/generated_component_test.go b/processor/memorylimiterprocessor/generated_component_test.go index 0805632c347..1820e3e0a8c 100644 --- a/processor/memorylimiterprocessor/generated_component_test.go +++ b/processor/memorylimiterprocessor/generated_component_test.go @@ -34,26 +34,26 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) { return factory.CreateLogsProcessor(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "metrics", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsProcessor(ctx, set, cfg, consumertest.NewNop()) }, }, { name: "traces", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set processor.Settings, cfg component.Config) (component.Component, error) { return factory.CreateTracesProcessor(ctx, set, cfg, consumertest.NewNop()) }, }, @@ -68,7 +68,7 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-lifecycle", func(t *testing.T) { - c, err := test.createFn(context.Background(), processortest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), processortest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() err = c.Start(context.Background(), host) diff --git a/processor/memorylimiterprocessor/memorylimiter.go b/processor/memorylimiterprocessor/memorylimiter.go index 6d7368bfb6a..8cb1576038a 100644 --- a/processor/memorylimiterprocessor/memorylimiter.go +++ b/processor/memorylimiterprocessor/memorylimiter.go @@ -21,7 +21,7 @@ type memoryLimiterProcessor struct { } // newMemoryLimiter returns a new memorylimiter processor. -func newMemoryLimiterProcessor(set processor.CreateSettings, cfg *Config) (*memoryLimiterProcessor, error) { +func newMemoryLimiterProcessor(set processor.Settings, cfg *Config) (*memoryLimiterProcessor, error) { ml, err := memorylimiter.NewMemoryLimiter(cfg, set.Logger) if err != nil { return nil, err diff --git a/processor/memorylimiterprocessor/memorylimiter_test.go b/processor/memorylimiterprocessor/memorylimiter_test.go index 0c103157346..1ce63d794f3 100644 --- a/processor/memorylimiterprocessor/memorylimiter_test.go +++ b/processor/memorylimiterprocessor/memorylimiter_test.go @@ -51,12 +51,12 @@ func TestNoDataLoss(t *testing.T) { cfg.MemoryLimitMiB = uint32(ms.Alloc/(1024*1024) + expectedMemoryIncreaseMiB) cfg.MemorySpikeLimitMiB = 1 - set := processortest.NewNopCreateSettings() + set := processortest.NewNopSettings() limiter, err := newMemoryLimiterProcessor(set, cfg) require.NoError(t, err) - processor, err := processorhelper.NewLogsProcessor(context.Background(), processor.CreateSettings{ + processor, err := processorhelper.NewLogsProcessor(context.Background(), processor.Settings{ ID: component.MustNewID("nop"), }, cfg, exporter, limiter.processLogs, @@ -200,11 +200,11 @@ func TestMetricsMemoryPressureResponse(t *testing.T) { ms.Alloc = tt.memAlloc + tt.ballastSize } - ml, err := newMemoryLimiterProcessor(processortest.NewNopCreateSettings(), tt.mlCfg) + ml, err := newMemoryLimiterProcessor(processortest.NewNopSettings(), tt.mlCfg) require.NoError(t, err) mp, err := processorhelper.NewMetricsProcessor( context.Background(), - processortest.NewNopCreateSettings(), + processortest.NewNopSettings(), tt.mlCfg, consumertest.NewNop(), ml.processMetrics, @@ -317,11 +317,11 @@ func TestTraceMemoryPressureResponse(t *testing.T) { ms.Alloc = tt.memAlloc + tt.ballastSize } - ml, err := newMemoryLimiterProcessor(processortest.NewNopCreateSettings(), tt.mlCfg) + ml, err := newMemoryLimiterProcessor(processortest.NewNopSettings(), tt.mlCfg) require.NoError(t, err) tp, err := processorhelper.NewTracesProcessor( context.Background(), - processortest.NewNopCreateSettings(), + processortest.NewNopSettings(), tt.mlCfg, consumertest.NewNop(), ml.processTraces, @@ -434,11 +434,11 @@ func TestLogMemoryPressureResponse(t *testing.T) { ms.Alloc = tt.memAlloc + tt.ballastSize } - ml, err := newMemoryLimiterProcessor(processortest.NewNopCreateSettings(), tt.mlCfg) + ml, err := newMemoryLimiterProcessor(processortest.NewNopSettings(), tt.mlCfg) require.NoError(t, err) tp, err := processorhelper.NewLogsProcessor( context.Background(), - processortest.NewNopCreateSettings(), + processortest.NewNopSettings(), tt.mlCfg, consumertest.NewNop(), ml.processLogs, diff --git a/processor/processor.go b/processor/processor.go index 98feba69a57..4618fa006fe 100644 --- a/processor/processor.go +++ b/processor/processor.go @@ -37,7 +37,12 @@ type Logs interface { } // CreateSettings is passed to Create* functions in Factory. -type CreateSettings struct { +// +// Deprecated: [v0.103.0] Use processor.Settings instead. +type CreateSettings = Settings + +// Settings is passed to Create* functions in Factory. +type Settings struct { // ID returns the ID of the component that will be created. ID component.ID @@ -57,7 +62,7 @@ type Factory interface { // CreateTracesProcessor creates a TracesProcessor based on this config. // If the processor type does not support tracing or if the config is not valid, // an error will be returned instead. - CreateTracesProcessor(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Traces) (Traces, error) + CreateTracesProcessor(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Traces) (Traces, error) // TracesProcessorStability gets the stability level of the TracesProcessor. TracesProcessorStability() component.StabilityLevel @@ -65,7 +70,7 @@ type Factory interface { // CreateMetricsProcessor creates a MetricsProcessor based on this config. // If the processor type does not support metrics or if the config is not valid, // an error will be returned instead. - CreateMetricsProcessor(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (Metrics, error) + CreateMetricsProcessor(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Metrics) (Metrics, error) // MetricsProcessorStability gets the stability level of the MetricsProcessor. MetricsProcessorStability() component.StabilityLevel @@ -73,7 +78,7 @@ type Factory interface { // CreateLogsProcessor creates a LogsProcessor based on the config. // If the processor type does not support logs or if the config is not valid, // an error will be returned instead. - CreateLogsProcessor(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Logs) (Logs, error) + CreateLogsProcessor(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Logs) (Logs, error) // LogsProcessorStability gets the stability level of the LogsProcessor. LogsProcessorStability() component.StabilityLevel @@ -97,12 +102,12 @@ func (f factoryOptionFunc) applyProcessorFactoryOption(o *factory) { } // CreateTracesFunc is the equivalent of Factory.CreateTraces(). -type CreateTracesFunc func(context.Context, CreateSettings, component.Config, consumer.Traces) (Traces, error) +type CreateTracesFunc func(context.Context, Settings, component.Config, consumer.Traces) (Traces, error) // CreateTracesProcessor implements Factory.CreateTracesProcessor(). func (f CreateTracesFunc) CreateTracesProcessor( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Traces) (Traces, error) { if f == nil { @@ -112,12 +117,12 @@ func (f CreateTracesFunc) CreateTracesProcessor( } // CreateMetricsFunc is the equivalent of Factory.CreateMetrics(). -type CreateMetricsFunc func(context.Context, CreateSettings, component.Config, consumer.Metrics) (Metrics, error) +type CreateMetricsFunc func(context.Context, Settings, component.Config, consumer.Metrics) (Metrics, error) // CreateMetricsProcessor implements Factory.CreateMetricsProcessor(). func (f CreateMetricsFunc) CreateMetricsProcessor( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Metrics, ) (Metrics, error) { @@ -128,12 +133,12 @@ func (f CreateMetricsFunc) CreateMetricsProcessor( } // CreateLogsFunc is the equivalent of Factory.CreateLogs(). -type CreateLogsFunc func(context.Context, CreateSettings, component.Config, consumer.Logs) (Logs, error) +type CreateLogsFunc func(context.Context, Settings, component.Config, consumer.Logs) (Logs, error) // CreateLogsProcessor implements Factory.CreateLogsProcessor(). func (f CreateLogsFunc) CreateLogsProcessor( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Logs, ) (Logs, error) { @@ -233,7 +238,7 @@ func NewBuilder(cfgs map[component.ID]component.Config, factories map[component. } // CreateTraces creates a Traces processor based on the settings and config. -func (b *Builder) CreateTraces(ctx context.Context, set CreateSettings, next consumer.Traces) (Traces, error) { +func (b *Builder) CreateTraces(ctx context.Context, set Settings, next consumer.Traces) (Traces, error) { if next == nil { return nil, errNilNextConsumer } @@ -252,7 +257,7 @@ func (b *Builder) CreateTraces(ctx context.Context, set CreateSettings, next con } // CreateMetrics creates a Metrics processor based on the settings and config. -func (b *Builder) CreateMetrics(ctx context.Context, set CreateSettings, next consumer.Metrics) (Metrics, error) { +func (b *Builder) CreateMetrics(ctx context.Context, set Settings, next consumer.Metrics) (Metrics, error) { if next == nil { return nil, errNilNextConsumer } @@ -271,7 +276,7 @@ func (b *Builder) CreateMetrics(ctx context.Context, set CreateSettings, next co } // CreateLogs creates a Logs processor based on the settings and config. -func (b *Builder) CreateLogs(ctx context.Context, set CreateSettings, next consumer.Logs) (Logs, error) { +func (b *Builder) CreateLogs(ctx context.Context, set Settings, next consumer.Logs) (Logs, error) { if next == nil { return nil, errNilNextConsumer } diff --git a/processor/processor_test.go b/processor/processor_test.go index 83207ba6955..4f78e6a575d 100644 --- a/processor/processor_test.go +++ b/processor/processor_test.go @@ -24,11 +24,11 @@ func TestNewFactory(t *testing.T) { func() component.Config { return &defaultCfg }) assert.EqualValues(t, testType, factory.Type()) assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) - _, err := factory.CreateTracesProcessor(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err := factory.CreateTracesProcessor(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.Error(t, err) - _, err = factory.CreateMetricsProcessor(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsProcessor(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.Error(t, err) - _, err = factory.CreateLogsProcessor(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsProcessor(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.Error(t, err) } @@ -45,15 +45,15 @@ func TestNewFactoryWithOptions(t *testing.T) { assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) assert.Equal(t, component.StabilityLevelAlpha, factory.TracesProcessorStability()) - _, err := factory.CreateTracesProcessor(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err := factory.CreateTracesProcessor(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelBeta, factory.MetricsProcessorStability()) - _, err = factory.CreateMetricsProcessor(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsProcessor(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelUnmaintained, factory.LogsProcessorStability()) - _, err = factory.CreateLogsProcessor(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsProcessor(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) } @@ -244,20 +244,20 @@ type nopProcessor struct { consumertest.Consumer } -func createTraces(context.Context, CreateSettings, component.Config, consumer.Traces) (Traces, error) { +func createTraces(context.Context, Settings, component.Config, consumer.Traces) (Traces, error) { return nopInstance, nil } -func createMetrics(context.Context, CreateSettings, component.Config, consumer.Metrics) (Metrics, error) { +func createMetrics(context.Context, Settings, component.Config, consumer.Metrics) (Metrics, error) { return nopInstance, nil } -func createLogs(context.Context, CreateSettings, component.Config, consumer.Logs) (Logs, error) { +func createLogs(context.Context, Settings, component.Config, consumer.Logs) (Logs, error) { return nopInstance, nil } -func createSettings(id component.ID) CreateSettings { - return CreateSettings{ +func createSettings(id component.ID) Settings { + return Settings{ ID: id, TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), diff --git a/processor/processorhelper/generated_component_telemetry_test.go b/processor/processorhelper/generated_component_telemetry_test.go index 95da78895e0..53e2c3c5a34 100644 --- a/processor/processorhelper/generated_component_telemetry_test.go +++ b/processor/processorhelper/generated_component_telemetry_test.go @@ -21,8 +21,8 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -func (tt *componentTestTelemetry) NewCreateSettings() processor.CreateSettings { - settings := processortest.NewNopCreateSettings() +func (tt *componentTestTelemetry) NewSettings() processor.Settings { + settings := processortest.NewNopSettings() settings.MeterProvider = tt.meterProvider settings.ID = component.NewID(component.MustNewType("processorhelper")) diff --git a/processor/processorhelper/logs.go b/processor/processorhelper/logs.go index ade2f45a385..d593a5f74a5 100644 --- a/processor/processorhelper/logs.go +++ b/processor/processorhelper/logs.go @@ -28,7 +28,7 @@ type logProcessor struct { // NewLogsProcessor creates a processor.Logs that ensure context propagation and the right tags are set. func NewLogsProcessor( _ context.Context, - set processor.CreateSettings, + set processor.Settings, _ component.Config, nextConsumer consumer.Logs, logsFunc ProcessLogsFunc, diff --git a/processor/processorhelper/logs_test.go b/processor/processorhelper/logs_test.go index 0fe43773309..a958ad33130 100644 --- a/processor/processorhelper/logs_test.go +++ b/processor/processorhelper/logs_test.go @@ -22,7 +22,7 @@ import ( var testLogsCfg = struct{}{} func TestNewLogsProcessor(t *testing.T) { - lp, err := NewLogsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testLogsCfg, consumertest.NewNop(), newTestLProcessor(nil)) + lp, err := NewLogsProcessor(context.Background(), processortest.NewNopSettings(), &testLogsCfg, consumertest.NewNop(), newTestLProcessor(nil)) require.NoError(t, err) assert.True(t, lp.Capabilities().MutatesData) @@ -33,7 +33,7 @@ func TestNewLogsProcessor(t *testing.T) { func TestNewLogsProcessor_WithOptions(t *testing.T) { want := errors.New("my_error") - lp, err := NewLogsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testLogsCfg, consumertest.NewNop(), newTestLProcessor(nil), + lp, err := NewLogsProcessor(context.Background(), processortest.NewNopSettings(), &testLogsCfg, consumertest.NewNop(), newTestLProcessor(nil), WithStart(func(context.Context, component.Host) error { return want }), WithShutdown(func(context.Context) error { return want }), WithCapabilities(consumer.Capabilities{MutatesData: false})) @@ -45,19 +45,19 @@ func TestNewLogsProcessor_WithOptions(t *testing.T) { } func TestNewLogsProcessor_NilRequiredFields(t *testing.T) { - _, err := NewLogsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testLogsCfg, consumertest.NewNop(), nil) + _, err := NewLogsProcessor(context.Background(), processortest.NewNopSettings(), &testLogsCfg, consumertest.NewNop(), nil) assert.Error(t, err) } func TestNewLogsProcessor_ProcessLogError(t *testing.T) { want := errors.New("my_error") - lp, err := NewLogsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testLogsCfg, consumertest.NewNop(), newTestLProcessor(want)) + lp, err := NewLogsProcessor(context.Background(), processortest.NewNopSettings(), &testLogsCfg, consumertest.NewNop(), newTestLProcessor(want)) require.NoError(t, err) assert.Equal(t, want, lp.ConsumeLogs(context.Background(), plog.NewLogs())) } func TestNewLogsProcessor_ProcessLogsErrSkipProcessingData(t *testing.T) { - lp, err := NewLogsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testLogsCfg, consumertest.NewNop(), newTestLProcessor(ErrSkipProcessingData)) + lp, err := NewLogsProcessor(context.Background(), processortest.NewNopSettings(), &testLogsCfg, consumertest.NewNop(), newTestLProcessor(ErrSkipProcessingData)) require.NoError(t, err) assert.Equal(t, nil, lp.ConsumeLogs(context.Background(), plog.NewLogs())) } diff --git a/processor/processorhelper/metrics.go b/processor/processorhelper/metrics.go index ac3802722d0..dc3388444c6 100644 --- a/processor/processorhelper/metrics.go +++ b/processor/processorhelper/metrics.go @@ -28,7 +28,7 @@ type metricsProcessor struct { // NewMetricsProcessor creates a processor.Metrics that ensure context propagation and the right tags are set. func NewMetricsProcessor( _ context.Context, - set processor.CreateSettings, + set processor.Settings, _ component.Config, nextConsumer consumer.Metrics, metricsFunc ProcessMetricsFunc, diff --git a/processor/processorhelper/metrics_test.go b/processor/processorhelper/metrics_test.go index b965c4d45c3..e3ac40e26bd 100644 --- a/processor/processorhelper/metrics_test.go +++ b/processor/processorhelper/metrics_test.go @@ -22,7 +22,7 @@ import ( var testMetricsCfg = struct{}{} func TestNewMetricsProcessor(t *testing.T) { - mp, err := NewMetricsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testMetricsCfg, consumertest.NewNop(), newTestMProcessor(nil)) + mp, err := NewMetricsProcessor(context.Background(), processortest.NewNopSettings(), &testMetricsCfg, consumertest.NewNop(), newTestMProcessor(nil)) require.NoError(t, err) assert.True(t, mp.Capabilities().MutatesData) @@ -33,7 +33,7 @@ func TestNewMetricsProcessor(t *testing.T) { func TestNewMetricsProcessor_WithOptions(t *testing.T) { want := errors.New("my_error") - mp, err := NewMetricsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testMetricsCfg, consumertest.NewNop(), newTestMProcessor(nil), + mp, err := NewMetricsProcessor(context.Background(), processortest.NewNopSettings(), &testMetricsCfg, consumertest.NewNop(), newTestMProcessor(nil), WithStart(func(context.Context, component.Host) error { return want }), WithShutdown(func(context.Context) error { return want }), WithCapabilities(consumer.Capabilities{MutatesData: false})) @@ -45,19 +45,19 @@ func TestNewMetricsProcessor_WithOptions(t *testing.T) { } func TestNewMetricsProcessor_NilRequiredFields(t *testing.T) { - _, err := NewMetricsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testMetricsCfg, consumertest.NewNop(), nil) + _, err := NewMetricsProcessor(context.Background(), processortest.NewNopSettings(), &testMetricsCfg, consumertest.NewNop(), nil) assert.Error(t, err) } func TestNewMetricsProcessor_ProcessMetricsError(t *testing.T) { want := errors.New("my_error") - mp, err := NewMetricsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testMetricsCfg, consumertest.NewNop(), newTestMProcessor(want)) + mp, err := NewMetricsProcessor(context.Background(), processortest.NewNopSettings(), &testMetricsCfg, consumertest.NewNop(), newTestMProcessor(want)) require.NoError(t, err) assert.Equal(t, want, mp.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) } func TestNewMetricsProcessor_ProcessMetricsErrSkipProcessingData(t *testing.T) { - mp, err := NewMetricsProcessor(context.Background(), processortest.NewNopCreateSettings(), &testMetricsCfg, consumertest.NewNop(), newTestMProcessor(ErrSkipProcessingData)) + mp, err := NewMetricsProcessor(context.Background(), processortest.NewNopSettings(), &testMetricsCfg, consumertest.NewNop(), newTestMProcessor(ErrSkipProcessingData)) require.NoError(t, err) assert.Equal(t, nil, mp.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) } diff --git a/processor/processorhelper/obsreport.go b/processor/processorhelper/obsreport.go index 51aa26a9a88..d4d2730f53a 100644 --- a/processor/processorhelper/obsreport.go +++ b/processor/processorhelper/obsreport.go @@ -42,7 +42,7 @@ type ObsReport struct { // ObsReportSettings are settings for creating an ObsReport. type ObsReportSettings struct { ProcessorID component.ID - ProcessorCreateSettings processor.CreateSettings + ProcessorCreateSettings processor.Settings } // NewObsReport creates a new Processor. diff --git a/processor/processorhelper/obsreport_test.go b/processor/processorhelper/obsreport_test.go index d9313234874..52da51007a4 100644 --- a/processor/processorhelper/obsreport_test.go +++ b/processor/processorhelper/obsreport_test.go @@ -27,7 +27,7 @@ func TestProcessorTraceData(t *testing.T) { const droppedSpans = 13 obsrep, err := newObsReport(ObsReportSettings{ ProcessorID: processorID, - ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) obsrep.TracesAccepted(context.Background(), acceptedSpans) @@ -46,7 +46,7 @@ func TestProcessorMetricsData(t *testing.T) { obsrep, err := newObsReport(ObsReportSettings{ ProcessorID: processorID, - ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) obsrep.MetricsAccepted(context.Background(), acceptedPoints) @@ -87,7 +87,7 @@ func TestProcessorLogRecords(t *testing.T) { obsrep, err := newObsReport(ObsReportSettings{ ProcessorID: processorID, - ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) require.NoError(t, err) obsrep.LogsAccepted(context.Background(), acceptedRecords) @@ -105,7 +105,7 @@ func TestCheckProcessorTracesViews(t *testing.T) { por, err := NewObsReport(ObsReportSettings{ ProcessorID: processorID, - ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) assert.NoError(t, err) @@ -130,7 +130,7 @@ func TestCheckProcessorMetricsViews(t *testing.T) { por, err := NewObsReport(ObsReportSettings{ ProcessorID: processorID, - ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) assert.NoError(t, err) @@ -155,7 +155,7 @@ func TestCheckProcessorLogViews(t *testing.T) { por, err := NewObsReport(ObsReportSettings{ ProcessorID: processorID, - ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, + ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, }) assert.NoError(t, err) @@ -184,7 +184,7 @@ func TestNoMetrics(t *testing.T) { por, err := NewObsReport(ObsReportSettings{ ProcessorID: processorID, - ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: set, BuildInfo: component.NewDefaultBuildInfo()}, + ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: set, BuildInfo: component.NewDefaultBuildInfo()}, }) assert.NoError(t, err) @@ -203,7 +203,7 @@ func TestNoMetrics(t *testing.T) { por, err := NewObsReport(ObsReportSettings{ ProcessorID: processorID, - ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: set, BuildInfo: component.NewDefaultBuildInfo()}, + ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: set, BuildInfo: component.NewDefaultBuildInfo()}, }) assert.NoError(t, err) @@ -222,7 +222,7 @@ func TestNoMetrics(t *testing.T) { por, err := NewObsReport(ObsReportSettings{ ProcessorID: processorID, - ProcessorCreateSettings: processor.CreateSettings{ID: processorID, TelemetrySettings: set, BuildInfo: component.NewDefaultBuildInfo()}, + ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: set, BuildInfo: component.NewDefaultBuildInfo()}, }) assert.NoError(t, err) diff --git a/processor/processorhelper/traces.go b/processor/processorhelper/traces.go index 578f65c7efa..9f24c2a8b0f 100644 --- a/processor/processorhelper/traces.go +++ b/processor/processorhelper/traces.go @@ -28,7 +28,7 @@ type tracesProcessor struct { // NewTracesProcessor creates a processor.Traces that ensure context propagation and the right tags are set. func NewTracesProcessor( _ context.Context, - set processor.CreateSettings, + set processor.Settings, _ component.Config, nextConsumer consumer.Traces, tracesFunc ProcessTracesFunc, diff --git a/processor/processorhelper/traces_test.go b/processor/processorhelper/traces_test.go index f2a59473a44..dd6b5eaa18a 100644 --- a/processor/processorhelper/traces_test.go +++ b/processor/processorhelper/traces_test.go @@ -22,7 +22,7 @@ import ( var testTracesCfg = struct{}{} func TestNewTracesProcessor(t *testing.T) { - tp, err := NewTracesProcessor(context.Background(), processortest.NewNopCreateSettings(), &testTracesCfg, consumertest.NewNop(), newTestTProcessor(nil)) + tp, err := NewTracesProcessor(context.Background(), processortest.NewNopSettings(), &testTracesCfg, consumertest.NewNop(), newTestTProcessor(nil)) require.NoError(t, err) assert.True(t, tp.Capabilities().MutatesData) @@ -33,7 +33,7 @@ func TestNewTracesProcessor(t *testing.T) { func TestNewTracesProcessor_WithOptions(t *testing.T) { want := errors.New("my_error") - tp, err := NewTracesProcessor(context.Background(), processortest.NewNopCreateSettings(), &testTracesCfg, consumertest.NewNop(), newTestTProcessor(nil), + tp, err := NewTracesProcessor(context.Background(), processortest.NewNopSettings(), &testTracesCfg, consumertest.NewNop(), newTestTProcessor(nil), WithStart(func(context.Context, component.Host) error { return want }), WithShutdown(func(context.Context) error { return want }), WithCapabilities(consumer.Capabilities{MutatesData: false})) @@ -45,19 +45,19 @@ func TestNewTracesProcessor_WithOptions(t *testing.T) { } func TestNewTracesProcessor_NilRequiredFields(t *testing.T) { - _, err := NewTracesProcessor(context.Background(), processortest.NewNopCreateSettings(), &testTracesCfg, consumertest.NewNop(), nil) + _, err := NewTracesProcessor(context.Background(), processortest.NewNopSettings(), &testTracesCfg, consumertest.NewNop(), nil) assert.Error(t, err) } func TestNewTracesProcessor_ProcessTraceError(t *testing.T) { want := errors.New("my_error") - tp, err := NewTracesProcessor(context.Background(), processortest.NewNopCreateSettings(), &testTracesCfg, consumertest.NewNop(), newTestTProcessor(want)) + tp, err := NewTracesProcessor(context.Background(), processortest.NewNopSettings(), &testTracesCfg, consumertest.NewNop(), newTestTProcessor(want)) require.NoError(t, err) assert.Equal(t, want, tp.ConsumeTraces(context.Background(), ptrace.NewTraces())) } func TestNewTracesProcessor_ProcessTracesErrSkipProcessingData(t *testing.T) { - tp, err := NewTracesProcessor(context.Background(), processortest.NewNopCreateSettings(), &testTracesCfg, consumertest.NewNop(), newTestTProcessor(ErrSkipProcessingData)) + tp, err := NewTracesProcessor(context.Background(), processortest.NewNopSettings(), &testTracesCfg, consumertest.NewNop(), newTestTProcessor(ErrSkipProcessingData)) require.NoError(t, err) assert.Equal(t, nil, tp.ConsumeTraces(context.Background(), ptrace.NewTraces())) } diff --git a/processor/processortest/nop_processor.go b/processor/processortest/nop_processor.go index 6ac5eb1bbbd..bf2627a9c9e 100644 --- a/processor/processortest/nop_processor.go +++ b/processor/processortest/nop_processor.go @@ -18,8 +18,15 @@ import ( var nopType = component.MustNewType("nop") // NewNopCreateSettings returns a new nop settings for Create*Processor functions. -func NewNopCreateSettings() processor.CreateSettings { - return processor.CreateSettings{ +// +// Deprecated: [v0.103.0] Use processortest.NewNopSettings instead. +func NewNopCreateSettings() processor.Settings { + return NewNopSettings() +} + +// NewNopSettings returns a new nop settings for Create*Processor functions. +func NewNopSettings() processor.Settings { + return processor.Settings{ ID: component.NewIDWithName(nopType, uuid.NewString()), TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), @@ -37,15 +44,15 @@ func NewNopFactory() processor.Factory { ) } -func createTracesProcessor(context.Context, processor.CreateSettings, component.Config, consumer.Traces) (processor.Traces, error) { +func createTracesProcessor(context.Context, processor.Settings, component.Config, consumer.Traces) (processor.Traces, error) { return nopInstance, nil } -func createMetricsProcessor(context.Context, processor.CreateSettings, component.Config, consumer.Metrics) (processor.Metrics, error) { +func createMetricsProcessor(context.Context, processor.Settings, component.Config, consumer.Metrics) (processor.Metrics, error) { return nopInstance, nil } -func createLogsProcessor(context.Context, processor.CreateSettings, component.Config, consumer.Logs) (processor.Logs, error) { +func createLogsProcessor(context.Context, processor.Settings, component.Config, consumer.Logs) (processor.Logs, error) { return nopInstance, nil } diff --git a/processor/processortest/nop_processor_test.go b/processor/processortest/nop_processor_test.go index 77e9131ed62..41a52893d15 100644 --- a/processor/processortest/nop_processor_test.go +++ b/processor/processortest/nop_processor_test.go @@ -26,21 +26,21 @@ func TestNewNopFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &nopConfig{}, cfg) - traces, err := factory.CreateTracesProcessor(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + traces, err := factory.CreateTracesProcessor(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.Equal(t, consumer.Capabilities{MutatesData: false}, traces.Capabilities()) assert.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, traces.ConsumeTraces(context.Background(), ptrace.NewTraces())) assert.NoError(t, traces.Shutdown(context.Background())) - metrics, err := factory.CreateMetricsProcessor(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + metrics, err := factory.CreateMetricsProcessor(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.Equal(t, consumer.Capabilities{MutatesData: false}, metrics.Capabilities()) assert.NoError(t, metrics.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, metrics.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) assert.NoError(t, metrics.Shutdown(context.Background())) - logs, err := factory.CreateLogsProcessor(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + logs, err := factory.CreateLogsProcessor(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.Equal(t, consumer.Capabilities{MutatesData: false}, logs.Capabilities()) assert.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost())) @@ -54,7 +54,7 @@ func TestNewNopBuilder(t *testing.T) { factory := NewNopFactory() cfg := factory.CreateDefaultConfig() - set := NewNopCreateSettings() + set := NewNopSettings() set.ID = component.NewID(nopType) traces, err := factory.CreateTracesProcessor(context.Background(), set, cfg, consumertest.NewNop()) diff --git a/processor/processortest/shutdown_verifier.go b/processor/processortest/shutdown_verifier.go index 1048fe7b712..d020f6e4f8a 100644 --- a/processor/processortest/shutdown_verifier.go +++ b/processor/processortest/shutdown_verifier.go @@ -21,7 +21,7 @@ import ( func verifyTracesDoesNotProduceAfterShutdown(t *testing.T, factory processor.Factory, cfg component.Config) { // Create a proc and output its produce to a sink. nextSink := new(consumertest.TracesSink) - proc, err := factory.CreateTracesProcessor(context.Background(), NewNopCreateSettings(), cfg, nextSink) + proc, err := factory.CreateTracesProcessor(context.Background(), NewNopSettings(), cfg, nextSink) if errors.Is(err, component.ErrDataTypeIsNotSupported) { return } @@ -45,7 +45,7 @@ func verifyTracesDoesNotProduceAfterShutdown(t *testing.T, factory processor.Fac func verifyLogsDoesNotProduceAfterShutdown(t *testing.T, factory processor.Factory, cfg component.Config) { // Create a proc and output its produce to a sink. nextSink := new(consumertest.LogsSink) - proc, err := factory.CreateLogsProcessor(context.Background(), NewNopCreateSettings(), cfg, nextSink) + proc, err := factory.CreateLogsProcessor(context.Background(), NewNopSettings(), cfg, nextSink) if errors.Is(err, component.ErrDataTypeIsNotSupported) { return } @@ -69,7 +69,7 @@ func verifyLogsDoesNotProduceAfterShutdown(t *testing.T, factory processor.Facto func verifyMetricsDoesNotProduceAfterShutdown(t *testing.T, factory processor.Factory, cfg component.Config) { // Create a proc and output its produce to a sink. nextSink := new(consumertest.MetricsSink) - proc, err := factory.CreateMetricsProcessor(context.Background(), NewNopCreateSettings(), cfg, nextSink) + proc, err := factory.CreateMetricsProcessor(context.Background(), NewNopSettings(), cfg, nextSink) if errors.Is(err, component.ErrDataTypeIsNotSupported) { return } diff --git a/processor/processortest/shutdown_verifier_test.go b/processor/processortest/shutdown_verifier_test.go index 70ae639068f..c65e251c231 100644 --- a/processor/processortest/shutdown_verifier_test.go +++ b/processor/processortest/shutdown_verifier_test.go @@ -72,19 +72,19 @@ func (passthroughProcessor) Capabilities() consumer.Capabilities { return consumer.Capabilities{} } -func createPassthroughLogsProcessor(_ context.Context, _ processor.CreateSettings, _ component.Config, logs consumer.Logs) (processor.Logs, error) { +func createPassthroughLogsProcessor(_ context.Context, _ processor.Settings, _ component.Config, logs consumer.Logs) (processor.Logs, error) { return passthroughProcessor{ nextLogs: logs, }, nil } -func createPassthroughMetricsProcessor(_ context.Context, _ processor.CreateSettings, _ component.Config, metrics consumer.Metrics) (processor.Metrics, error) { +func createPassthroughMetricsProcessor(_ context.Context, _ processor.Settings, _ component.Config, metrics consumer.Metrics) (processor.Metrics, error) { return passthroughProcessor{ nextMetrics: metrics, }, nil } -func createPassthroughTracesProcessor(_ context.Context, _ processor.CreateSettings, _ component.Config, traces consumer.Traces) (processor.Traces, error) { +func createPassthroughTracesProcessor(_ context.Context, _ processor.Settings, _ component.Config, traces consumer.Traces) (processor.Traces, error) { return passthroughProcessor{ nextTraces: traces, }, nil diff --git a/processor/processortest/unhealthy_processor.go b/processor/processortest/unhealthy_processor.go index 196787de97c..c537ab53498 100644 --- a/processor/processortest/unhealthy_processor.go +++ b/processor/processortest/unhealthy_processor.go @@ -14,8 +14,8 @@ import ( ) // NewUnhealthyProcessorCreateSettings returns a new nop settings for Create*Processor functions. -func NewUnhealthyProcessorCreateSettings() processor.CreateSettings { - return processor.CreateSettings{ +func NewUnhealthyProcessorCreateSettings() processor.Settings { + return processor.Settings{ TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), } @@ -34,21 +34,21 @@ func NewUnhealthyProcessorFactory() processor.Factory { ) } -func createUnhealthyTracesProcessor(_ context.Context, set processor.CreateSettings, _ component.Config, _ consumer.Traces) (processor.Traces, error) { +func createUnhealthyTracesProcessor(_ context.Context, set processor.Settings, _ component.Config, _ consumer.Traces) (processor.Traces, error) { return &unhealthyProcessor{ Consumer: consumertest.NewNop(), telemetry: set.TelemetrySettings, }, nil } -func createUnhealthyMetricsProcessor(_ context.Context, set processor.CreateSettings, _ component.Config, _ consumer.Metrics) (processor.Metrics, error) { +func createUnhealthyMetricsProcessor(_ context.Context, set processor.Settings, _ component.Config, _ consumer.Metrics) (processor.Metrics, error) { return &unhealthyProcessor{ Consumer: consumertest.NewNop(), telemetry: set.TelemetrySettings, }, nil } -func createUnhealthyLogsProcessor(_ context.Context, set processor.CreateSettings, _ component.Config, _ consumer.Logs) (processor.Logs, error) { +func createUnhealthyLogsProcessor(_ context.Context, set processor.Settings, _ component.Config, _ consumer.Logs) (processor.Logs, error) { return &unhealthyProcessor{ Consumer: consumertest.NewNop(), telemetry: set.TelemetrySettings, diff --git a/service/internal/graph/graph_test.go b/service/internal/graph/graph_test.go index 642b2082bfc..561aa77fb95 100644 --- a/service/internal/graph/graph_test.go +++ b/service/internal/graph/graph_test.go @@ -2471,13 +2471,13 @@ func newErrReceiverFactory() receiver.Factory { func newErrProcessorFactory() processor.Factory { return processor.NewFactory(component.MustNewType("err"), func() component.Config { return &struct{}{} }, - processor.WithTraces(func(context.Context, processor.CreateSettings, component.Config, consumer.Traces) (processor.Traces, error) { + processor.WithTraces(func(context.Context, processor.Settings, component.Config, consumer.Traces) (processor.Traces, error) { return &errComponent{}, nil }, component.StabilityLevelUndefined), - processor.WithLogs(func(context.Context, processor.CreateSettings, component.Config, consumer.Logs) (processor.Logs, error) { + processor.WithLogs(func(context.Context, processor.Settings, component.Config, consumer.Logs) (processor.Logs, error) { return &errComponent{}, nil }, component.StabilityLevelUndefined), - processor.WithMetrics(func(context.Context, processor.CreateSettings, component.Config, consumer.Metrics) (processor.Metrics, error) { + processor.WithMetrics(func(context.Context, processor.Settings, component.Config, consumer.Metrics) (processor.Metrics, error) { return &errComponent{}, nil }, component.StabilityLevelUndefined), ) diff --git a/service/internal/graph/nodes.go b/service/internal/graph/nodes.go index 4136fc3c538..acbd43c8969 100644 --- a/service/internal/graph/nodes.go +++ b/service/internal/graph/nodes.go @@ -133,7 +133,7 @@ func (n *processorNode) buildComponent(ctx context.Context, builder *processor.Builder, next baseConsumer, ) error { - set := processor.CreateSettings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info} + set := processor.Settings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info} set.TelemetrySettings.Logger = components.ProcessorLogger(set.TelemetrySettings.Logger, n.componentID, n.pipelineID) var err error switch n.pipelineID.Type() { diff --git a/service/internal/testcomponents/example_processor.go b/service/internal/testcomponents/example_processor.go index 9f73611853b..1d8f2d35a12 100644 --- a/service/internal/testcomponents/example_processor.go +++ b/service/internal/testcomponents/example_processor.go @@ -26,21 +26,21 @@ func createDefaultConfig() component.Config { return &struct{}{} } -func createTracesProcessor(_ context.Context, set processor.CreateSettings, _ component.Config, nextConsumer consumer.Traces) (processor.Traces, error) { +func createTracesProcessor(_ context.Context, set processor.Settings, _ component.Config, nextConsumer consumer.Traces) (processor.Traces, error) { return &ExampleProcessor{ ConsumeTracesFunc: nextConsumer.ConsumeTraces, mutatesData: set.ID.Name() == "mutate", }, nil } -func createMetricsProcessor(_ context.Context, set processor.CreateSettings, _ component.Config, nextConsumer consumer.Metrics) (processor.Metrics, error) { +func createMetricsProcessor(_ context.Context, set processor.Settings, _ component.Config, nextConsumer consumer.Metrics) (processor.Metrics, error) { return &ExampleProcessor{ ConsumeMetricsFunc: nextConsumer.ConsumeMetrics, mutatesData: set.ID.Name() == "mutate", }, nil } -func createLogsProcessor(_ context.Context, set processor.CreateSettings, _ component.Config, nextConsumer consumer.Logs) (processor.Logs, error) { +func createLogsProcessor(_ context.Context, set processor.Settings, _ component.Config, nextConsumer consumer.Logs) (processor.Logs, error) { return &ExampleProcessor{ ConsumeLogsFunc: nextConsumer.ConsumeLogs, mutatesData: set.ID.Name() == "mutate", From 3b3deb8dbe189658aba6371e7a625ac983115df9 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:04:47 -0700 Subject: [PATCH 045/168] [connector] deprecate CreateSettings -> Settings (#10338) This deprecates CreateSettings in favour of Settings. NewNopCreateSettings is also being deprecated in favour of NewNopSettings Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_create-settings-connector.yaml | 28 ++++++ .../component_telemetry_test.go.tmpl | 2 +- cmd/mdatagen/templates/component_test.go.tmpl | 26 ++--- connector/connector.go | 79 ++++++++-------- connector/connector_test.go | 94 +++++++++---------- connector/connectortest/connector.go | 29 +++--- connector/connectortest/connector_test.go | 20 ++-- connector/forwardconnector/forward.go | 6 +- connector/forwardconnector/forward_test.go | 2 +- .../generated_component_test.go | 14 +-- service/internal/graph/graph_test.go | 18 ++-- service/internal/graph/nodes.go | 2 +- .../testcomponents/example_connector.go | 18 ++-- .../internal/testcomponents/example_router.go | 6 +- .../testcomponents/example_router_test.go | 6 +- 15 files changed, 195 insertions(+), 155 deletions(-) create mode 100644 .chloggen/codeboten_create-settings-connector.yaml diff --git a/.chloggen/codeboten_create-settings-connector.yaml b/.chloggen/codeboten_create-settings-connector.yaml new file mode 100644 index 00000000000..708df0cf6df --- /dev/null +++ b/.chloggen/codeboten_create-settings-connector.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: connector + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate CreateSettings and NewNopCreateSettings + +# One or more tracking issues or pull requests related to the change +issues: [9428] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The following methods are being renamed: + - connector.CreateSettings -> connector.Settings + - connector.NewNopCreateSettings -> connector.NewNopSettings + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl index 48ab711622a..5ee950c270f 100644 --- a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl +++ b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl @@ -21,7 +21,7 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -{{- if (or isExporter isReceiver isProcessor) }} +{{- if (or isExporter isReceiver isProcessor isConnector) }} func (tt *componentTestTelemetry) NewSettings() {{ .Status.Class }}.Settings { settings := {{ .Status.Class }}test.NewNopSettings() settings.MeterProvider = tt.meterProvider diff --git a/cmd/mdatagen/templates/component_test.go.tmpl b/cmd/mdatagen/templates/component_test.go.tmpl index ef277d2ea4a..45106fe65d4 100644 --- a/cmd/mdatagen/templates/component_test.go.tmpl +++ b/cmd/mdatagen/templates/component_test.go.tmpl @@ -366,12 +366,12 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct{ name string - createFn func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) }{ {{ if supportsLogsToLogs }} { name: "logs_to_logs", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewLogsRouter(map[component.ID]consumer.Logs{component.NewID(component.DataTypeLogs): consumertest.NewNop()}) return factory.CreateLogsToLogs(ctx, set, cfg, router) }, @@ -380,7 +380,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsLogsToMetrics }} { name: "logs_to_metrics", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewMetricsRouter(map[component.ID]consumer.Metrics{component.NewID(component.DataTypeMetrics): consumertest.NewNop()}) return factory.CreateLogsToMetrics(ctx, set, cfg, router) }, @@ -389,7 +389,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsLogsToTraces }} { name: "logs_to_traces", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewTracesRouter(map[component.ID]consumer.Traces{component.NewID(component.DataTypeTraces): consumertest.NewNop()}) return factory.CreateLogsToTraces(ctx, set, cfg, router) }, @@ -398,7 +398,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsMetricsToLogs }} { name: "metrics_to_logs", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewLogsRouter(map[component.ID]consumer.Logs{component.NewID(component.DataTypeLogs): consumertest.NewNop()}) return factory.CreateMetricsToLogs(ctx, set, cfg, router) }, @@ -407,7 +407,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsMetricsToMetrics }} { name: "metrics_to_metrics", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewMetricsRouter(map[component.ID]consumer.Metrics{component.NewID(component.DataTypeMetrics): consumertest.NewNop()}) return factory.CreateMetricsToMetrics(ctx, set, cfg, router) }, @@ -416,7 +416,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsMetricsToTraces }} { name: "metrics_to_traces", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewTracesRouter(map[component.ID]consumer.Traces{component.NewID(component.DataTypeTraces): consumertest.NewNop()}) return factory.CreateMetricsToTraces(ctx, set, cfg, router) }, @@ -425,7 +425,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsTracesToLogs }} { name: "traces_to_logs", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewLogsRouter(map[component.ID]consumer.Logs{component.NewID(component.DataTypeLogs): consumertest.NewNop()}) return factory.CreateTracesToLogs(ctx, set, cfg, router) }, @@ -434,7 +434,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsTracesToMetrics }} { name: "traces_to_metrics", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewMetricsRouter(map[component.ID]consumer.Metrics{component.NewID(component.DataTypeMetrics): consumertest.NewNop()}) return factory.CreateTracesToMetrics(ctx, set, cfg, router) }, @@ -443,7 +443,7 @@ func TestComponentLifecycle(t *testing.T) { {{ if supportsTracesToTraces }} { name: "traces_to_traces", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewTracesRouter(map[component.ID]consumer.Traces{component.NewID(component.DataTypeTraces): consumertest.NewNop()}) return factory.CreateTracesToTraces(ctx, set, cfg, router) }, @@ -461,7 +461,7 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { {{- if not .Tests.SkipShutdown }} t.Run(test.name + "-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), connectortest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) @@ -470,13 +470,13 @@ func TestComponentLifecycle(t *testing.T) { {{- if not .Tests.SkipLifecycle }} t.Run(test.name + "-lifecycle", func(t *testing.T) { - firstConnector, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + firstConnector, err := test.createFn(context.Background(), connectortest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() require.NoError(t, err) require.NoError(t, firstConnector.Start(context.Background(), host)) require.NoError(t, firstConnector.Shutdown(context.Background())) - secondConnector, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + secondConnector, err := test.createFn(context.Background(), connectortest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondConnector.Start(context.Background(), host)) require.NoError(t, secondConnector.Shutdown(context.Background())) diff --git a/connector/connector.go b/connector/connector.go index 94927092117..48f2e6b089d 100644 --- a/connector/connector.go +++ b/connector/connector.go @@ -67,7 +67,12 @@ type Logs interface { } // CreateSettings configures Connector creators. -type CreateSettings struct { +// +// Deprecated: [v0.103.0] Use connector.Settings instead. +type CreateSettings = Settings + +// Settings configures Connector creators. +type Settings struct { // ID returns the ID of the component that will be created. ID component.ID @@ -93,17 +98,17 @@ type Factory interface { // tests of any implementation of the Factory interface. CreateDefaultConfig() component.Config - CreateTracesToTraces(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Traces) (Traces, error) - CreateTracesToMetrics(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (Traces, error) - CreateTracesToLogs(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Logs) (Traces, error) + CreateTracesToTraces(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Traces) (Traces, error) + CreateTracesToMetrics(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Metrics) (Traces, error) + CreateTracesToLogs(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Logs) (Traces, error) - CreateMetricsToTraces(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Traces) (Metrics, error) - CreateMetricsToMetrics(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (Metrics, error) - CreateMetricsToLogs(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Logs) (Metrics, error) + CreateMetricsToTraces(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Traces) (Metrics, error) + CreateMetricsToMetrics(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Metrics) (Metrics, error) + CreateMetricsToLogs(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Logs) (Metrics, error) - CreateLogsToTraces(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Traces) (Logs, error) - CreateLogsToMetrics(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (Logs, error) - CreateLogsToLogs(ctx context.Context, set CreateSettings, cfg component.Config, nextConsumer consumer.Logs) (Logs, error) + CreateLogsToTraces(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Traces) (Logs, error) + CreateLogsToMetrics(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Metrics) (Logs, error) + CreateLogsToLogs(ctx context.Context, set Settings, cfg component.Config, nextConsumer consumer.Logs) (Logs, error) TracesToTracesStability() component.StabilityLevel TracesToMetricsStability() component.StabilityLevel @@ -136,12 +141,12 @@ func (f factoryOptionFunc) apply(o *factory) { } // CreateTracesToTracesFunc is the equivalent of Factory.CreateTracesToTraces(). -type CreateTracesToTracesFunc func(context.Context, CreateSettings, component.Config, consumer.Traces) (Traces, error) +type CreateTracesToTracesFunc func(context.Context, Settings, component.Config, consumer.Traces) (Traces, error) // CreateTracesToTraces implements Factory.CreateTracesToTraces(). func (f CreateTracesToTracesFunc) CreateTracesToTraces( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Traces) (Traces, error) { if f == nil { @@ -151,12 +156,12 @@ func (f CreateTracesToTracesFunc) CreateTracesToTraces( } // CreateTracesToMetricsFunc is the equivalent of Factory.CreateTracesToMetrics(). -type CreateTracesToMetricsFunc func(context.Context, CreateSettings, component.Config, consumer.Metrics) (Traces, error) +type CreateTracesToMetricsFunc func(context.Context, Settings, component.Config, consumer.Metrics) (Traces, error) // CreateTracesToMetrics implements Factory.CreateTracesToMetrics(). func (f CreateTracesToMetricsFunc) CreateTracesToMetrics( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Metrics, ) (Traces, error) { @@ -167,12 +172,12 @@ func (f CreateTracesToMetricsFunc) CreateTracesToMetrics( } // CreateTracesToLogsFunc is the equivalent of Factory.CreateTracesToLogs(). -type CreateTracesToLogsFunc func(context.Context, CreateSettings, component.Config, consumer.Logs) (Traces, error) +type CreateTracesToLogsFunc func(context.Context, Settings, component.Config, consumer.Logs) (Traces, error) // CreateTracesToLogs implements Factory.CreateTracesToLogs(). func (f CreateTracesToLogsFunc) CreateTracesToLogs( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Logs, ) (Traces, error) { @@ -183,12 +188,12 @@ func (f CreateTracesToLogsFunc) CreateTracesToLogs( } // CreateMetricsToTracesFunc is the equivalent of Factory.CreateMetricsToTraces(). -type CreateMetricsToTracesFunc func(context.Context, CreateSettings, component.Config, consumer.Traces) (Metrics, error) +type CreateMetricsToTracesFunc func(context.Context, Settings, component.Config, consumer.Traces) (Metrics, error) // CreateMetricsToTraces implements Factory.CreateMetricsToTraces(). func (f CreateMetricsToTracesFunc) CreateMetricsToTraces( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Traces, ) (Metrics, error) { @@ -199,12 +204,12 @@ func (f CreateMetricsToTracesFunc) CreateMetricsToTraces( } // CreateMetricsToMetricsFunc is the equivalent of Factory.CreateMetricsToTraces(). -type CreateMetricsToMetricsFunc func(context.Context, CreateSettings, component.Config, consumer.Metrics) (Metrics, error) +type CreateMetricsToMetricsFunc func(context.Context, Settings, component.Config, consumer.Metrics) (Metrics, error) // CreateMetricsToMetrics implements Factory.CreateMetricsToTraces(). func (f CreateMetricsToMetricsFunc) CreateMetricsToMetrics( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Metrics, ) (Metrics, error) { @@ -215,12 +220,12 @@ func (f CreateMetricsToMetricsFunc) CreateMetricsToMetrics( } // CreateMetricsToLogsFunc is the equivalent of Factory.CreateMetricsToLogs(). -type CreateMetricsToLogsFunc func(context.Context, CreateSettings, component.Config, consumer.Logs) (Metrics, error) +type CreateMetricsToLogsFunc func(context.Context, Settings, component.Config, consumer.Logs) (Metrics, error) // CreateMetricsToLogs implements Factory.CreateMetricsToLogs(). func (f CreateMetricsToLogsFunc) CreateMetricsToLogs( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Logs, ) (Metrics, error) { @@ -231,12 +236,12 @@ func (f CreateMetricsToLogsFunc) CreateMetricsToLogs( } // CreateLogsToTracesFunc is the equivalent of Factory.CreateLogsToTraces(). -type CreateLogsToTracesFunc func(context.Context, CreateSettings, component.Config, consumer.Traces) (Logs, error) +type CreateLogsToTracesFunc func(context.Context, Settings, component.Config, consumer.Traces) (Logs, error) // CreateLogsToTraces implements Factory.CreateLogsToTraces(). func (f CreateLogsToTracesFunc) CreateLogsToTraces( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Traces, ) (Logs, error) { @@ -247,12 +252,12 @@ func (f CreateLogsToTracesFunc) CreateLogsToTraces( } // CreateLogsToMetricsFunc is the equivalent of Factory.CreateLogsToMetrics(). -type CreateLogsToMetricsFunc func(context.Context, CreateSettings, component.Config, consumer.Metrics) (Logs, error) +type CreateLogsToMetricsFunc func(context.Context, Settings, component.Config, consumer.Metrics) (Logs, error) // CreateLogsToMetrics implements Factory.CreateLogsToMetrics(). func (f CreateLogsToMetricsFunc) CreateLogsToMetrics( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Metrics, ) (Logs, error) { @@ -263,12 +268,12 @@ func (f CreateLogsToMetricsFunc) CreateLogsToMetrics( } // CreateLogsToLogsFunc is the equivalent of Factory.CreateLogsToLogs(). -type CreateLogsToLogsFunc func(context.Context, CreateSettings, component.Config, consumer.Logs) (Logs, error) +type CreateLogsToLogsFunc func(context.Context, Settings, component.Config, consumer.Logs) (Logs, error) // CreateLogsToLogs implements Factory.CreateLogsToLogs(). func (f CreateLogsToLogsFunc) CreateLogsToLogs( ctx context.Context, - set CreateSettings, + set Settings, cfg component.Config, nextConsumer consumer.Logs, ) (Logs, error) { @@ -460,7 +465,7 @@ func NewBuilder(cfgs map[component.ID]component.Config, factories map[component. } // CreateTracesToTraces creates a Traces connector based on the settings and config. -func (b *Builder) CreateTracesToTraces(ctx context.Context, set CreateSettings, next consumer.Traces) (Traces, error) { +func (b *Builder) CreateTracesToTraces(ctx context.Context, set Settings, next consumer.Traces) (Traces, error) { if next == nil { return nil, errNilNextConsumer } @@ -479,7 +484,7 @@ func (b *Builder) CreateTracesToTraces(ctx context.Context, set CreateSettings, } // CreateTracesToMetrics creates a Traces connector based on the settings and config. -func (b *Builder) CreateTracesToMetrics(ctx context.Context, set CreateSettings, next consumer.Metrics) (Traces, error) { +func (b *Builder) CreateTracesToMetrics(ctx context.Context, set Settings, next consumer.Metrics) (Traces, error) { if next == nil { return nil, errNilNextConsumer } @@ -498,7 +503,7 @@ func (b *Builder) CreateTracesToMetrics(ctx context.Context, set CreateSettings, } // CreateTracesToLogs creates a Traces connector based on the settings and config. -func (b *Builder) CreateTracesToLogs(ctx context.Context, set CreateSettings, next consumer.Logs) (Traces, error) { +func (b *Builder) CreateTracesToLogs(ctx context.Context, set Settings, next consumer.Logs) (Traces, error) { if next == nil { return nil, errNilNextConsumer } @@ -517,7 +522,7 @@ func (b *Builder) CreateTracesToLogs(ctx context.Context, set CreateSettings, ne } // CreateMetricsToTraces creates a Metrics connector based on the settings and config. -func (b *Builder) CreateMetricsToTraces(ctx context.Context, set CreateSettings, next consumer.Traces) (Metrics, error) { +func (b *Builder) CreateMetricsToTraces(ctx context.Context, set Settings, next consumer.Traces) (Metrics, error) { if next == nil { return nil, errNilNextConsumer } @@ -536,7 +541,7 @@ func (b *Builder) CreateMetricsToTraces(ctx context.Context, set CreateSettings, } // CreateMetricsToMetrics creates a Metrics connector based on the settings and config. -func (b *Builder) CreateMetricsToMetrics(ctx context.Context, set CreateSettings, next consumer.Metrics) (Metrics, error) { +func (b *Builder) CreateMetricsToMetrics(ctx context.Context, set Settings, next consumer.Metrics) (Metrics, error) { if next == nil { return nil, errNilNextConsumer } @@ -555,7 +560,7 @@ func (b *Builder) CreateMetricsToMetrics(ctx context.Context, set CreateSettings } // CreateMetricsToLogs creates a Metrics connector based on the settings and config. -func (b *Builder) CreateMetricsToLogs(ctx context.Context, set CreateSettings, next consumer.Logs) (Metrics, error) { +func (b *Builder) CreateMetricsToLogs(ctx context.Context, set Settings, next consumer.Logs) (Metrics, error) { if next == nil { return nil, errNilNextConsumer } @@ -574,7 +579,7 @@ func (b *Builder) CreateMetricsToLogs(ctx context.Context, set CreateSettings, n } // CreateLogsToTraces creates a Logs connector based on the settings and config. -func (b *Builder) CreateLogsToTraces(ctx context.Context, set CreateSettings, next consumer.Traces) (Logs, error) { +func (b *Builder) CreateLogsToTraces(ctx context.Context, set Settings, next consumer.Traces) (Logs, error) { if next == nil { return nil, errNilNextConsumer } @@ -593,7 +598,7 @@ func (b *Builder) CreateLogsToTraces(ctx context.Context, set CreateSettings, ne } // CreateLogsToMetrics creates a Logs connector based on the settings and config. -func (b *Builder) CreateLogsToMetrics(ctx context.Context, set CreateSettings, next consumer.Metrics) (Logs, error) { +func (b *Builder) CreateLogsToMetrics(ctx context.Context, set Settings, next consumer.Metrics) (Logs, error) { if next == nil { return nil, errNilNextConsumer } @@ -612,7 +617,7 @@ func (b *Builder) CreateLogsToMetrics(ctx context.Context, set CreateSettings, n } // CreateLogsToLogs creates a Logs connector based on the settings and config. -func (b *Builder) CreateLogsToLogs(ctx context.Context, set CreateSettings, next consumer.Logs) (Logs, error) { +func (b *Builder) CreateLogsToLogs(ctx context.Context, set Settings, next consumer.Logs) (Logs, error) { if next == nil { return nil, errNilNextConsumer } diff --git a/connector/connector_test.go b/connector/connector_test.go index 7384b50621d..8ead909f2bd 100644 --- a/connector/connector_test.go +++ b/connector/connector_test.go @@ -28,25 +28,25 @@ func TestNewFactoryNoOptions(t *testing.T) { assert.EqualValues(t, testType, factory.Type()) assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) - _, err := factory.CreateTracesToTraces(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err := factory.CreateTracesToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeTraces, component.DataTypeTraces)) - _, err = factory.CreateTracesToMetrics(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateTracesToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeTraces, component.DataTypeMetrics)) - _, err = factory.CreateTracesToLogs(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateTracesToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeTraces, component.DataTypeLogs)) - _, err = factory.CreateMetricsToTraces(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeMetrics, component.DataTypeTraces)) - _, err = factory.CreateMetricsToMetrics(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeMetrics, component.DataTypeMetrics)) - _, err = factory.CreateMetricsToLogs(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeMetrics, component.DataTypeLogs)) - _, err = factory.CreateLogsToTraces(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeLogs, component.DataTypeTraces)) - _, err = factory.CreateLogsToMetrics(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeLogs, component.DataTypeMetrics)) - _, err = factory.CreateLogsToLogs(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeLogs, component.DataTypeLogs)) } @@ -60,30 +60,30 @@ func TestNewFactoryWithSameTypes(t *testing.T) { assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) assert.Equal(t, component.StabilityLevelAlpha, factory.TracesToTracesStability()) - _, err := factory.CreateTracesToTraces(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err := factory.CreateTracesToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelBeta, factory.MetricsToMetricsStability()) - _, err = factory.CreateMetricsToMetrics(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelUnmaintained, factory.LogsToLogsStability()) - _, err = factory.CreateLogsToLogs(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) - _, err = factory.CreateTracesToMetrics(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateTracesToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeTraces, component.DataTypeMetrics)) - _, err = factory.CreateTracesToLogs(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateTracesToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeTraces, component.DataTypeLogs)) - _, err = factory.CreateMetricsToTraces(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeMetrics, component.DataTypeTraces)) - _, err = factory.CreateMetricsToLogs(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeMetrics, component.DataTypeLogs)) - _, err = factory.CreateLogsToTraces(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeLogs, component.DataTypeTraces)) - _, err = factory.CreateLogsToMetrics(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeLogs, component.DataTypeMetrics)) } @@ -99,35 +99,35 @@ func TestNewFactoryWithTranslateTypes(t *testing.T) { assert.EqualValues(t, testType, factory.Type()) assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) - _, err := factory.CreateTracesToTraces(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err := factory.CreateTracesToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeTraces, component.DataTypeTraces)) - _, err = factory.CreateMetricsToMetrics(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeMetrics, component.DataTypeMetrics)) - _, err = factory.CreateLogsToLogs(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.Equal(t, err, errDataTypes(testID, component.DataTypeLogs, component.DataTypeLogs)) assert.Equal(t, component.StabilityLevelDevelopment, factory.TracesToMetricsStability()) - _, err = factory.CreateTracesToMetrics(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateTracesToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelAlpha, factory.TracesToLogsStability()) - _, err = factory.CreateTracesToLogs(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateTracesToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelBeta, factory.MetricsToTracesStability()) - _, err = factory.CreateMetricsToTraces(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelStable, factory.MetricsToLogsStability()) - _, err = factory.CreateMetricsToLogs(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelDeprecated, factory.LogsToTracesStability()) - _, err = factory.CreateLogsToTraces(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelUnmaintained, factory.LogsToMetricsStability()) - _, err = factory.CreateLogsToMetrics(context.Background(), CreateSettings{ID: testID}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) } @@ -147,33 +147,33 @@ func TestNewFactoryWithAllTypes(t *testing.T) { assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) assert.Equal(t, component.StabilityLevelAlpha, factory.TracesToTracesStability()) - _, err := factory.CreateTracesToTraces(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err := factory.CreateTracesToTraces(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelDevelopment, factory.TracesToMetricsStability()) - _, err = factory.CreateTracesToMetrics(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateTracesToMetrics(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelAlpha, factory.TracesToLogsStability()) - _, err = factory.CreateTracesToLogs(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateTracesToLogs(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelBeta, factory.MetricsToTracesStability()) - _, err = factory.CreateMetricsToTraces(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToTraces(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelBeta, factory.MetricsToMetricsStability()) - _, err = factory.CreateMetricsToMetrics(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToMetrics(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelStable, factory.MetricsToLogsStability()) - _, err = factory.CreateMetricsToLogs(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateMetricsToLogs(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelDeprecated, factory.LogsToTracesStability()) - _, err = factory.CreateLogsToTraces(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToTraces(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelUnmaintained, factory.LogsToMetricsStability()) - _, err = factory.CreateLogsToMetrics(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToMetrics(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, component.StabilityLevelUnmaintained, factory.LogsToLogsStability()) - _, err = factory.CreateLogsToLogs(context.Background(), CreateSettings{}, &defaultCfg, consumertest.NewNop()) + _, err = factory.CreateLogsToLogs(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop()) assert.NoError(t, err) } @@ -467,38 +467,38 @@ type nopConnector struct { consumertest.Consumer } -func createTracesToTraces(context.Context, CreateSettings, component.Config, consumer.Traces) (Traces, error) { +func createTracesToTraces(context.Context, Settings, component.Config, consumer.Traces) (Traces, error) { return nopInstance, nil } -func createTracesToMetrics(context.Context, CreateSettings, component.Config, consumer.Metrics) (Traces, error) { +func createTracesToMetrics(context.Context, Settings, component.Config, consumer.Metrics) (Traces, error) { return nopInstance, nil } -func createTracesToLogs(context.Context, CreateSettings, component.Config, consumer.Logs) (Traces, error) { +func createTracesToLogs(context.Context, Settings, component.Config, consumer.Logs) (Traces, error) { return nopInstance, nil } -func createMetricsToTraces(context.Context, CreateSettings, component.Config, consumer.Traces) (Metrics, error) { +func createMetricsToTraces(context.Context, Settings, component.Config, consumer.Traces) (Metrics, error) { return nopInstance, nil } -func createMetricsToMetrics(context.Context, CreateSettings, component.Config, consumer.Metrics) (Metrics, error) { +func createMetricsToMetrics(context.Context, Settings, component.Config, consumer.Metrics) (Metrics, error) { return nopInstance, nil } -func createMetricsToLogs(context.Context, CreateSettings, component.Config, consumer.Logs) (Metrics, error) { +func createMetricsToLogs(context.Context, Settings, component.Config, consumer.Logs) (Metrics, error) { return nopInstance, nil } -func createLogsToTraces(context.Context, CreateSettings, component.Config, consumer.Traces) (Logs, error) { +func createLogsToTraces(context.Context, Settings, component.Config, consumer.Traces) (Logs, error) { return nopInstance, nil } -func createLogsToMetrics(context.Context, CreateSettings, component.Config, consumer.Metrics) (Logs, error) { +func createLogsToMetrics(context.Context, Settings, component.Config, consumer.Metrics) (Logs, error) { return nopInstance, nil } -func createLogsToLogs(context.Context, CreateSettings, component.Config, consumer.Logs) (Logs, error) { +func createLogsToLogs(context.Context, Settings, component.Config, consumer.Logs) (Logs, error) { return nopInstance, nil } -func createSettings(id component.ID) CreateSettings { - return CreateSettings{ +func createSettings(id component.ID) Settings { + return Settings{ ID: id, TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), diff --git a/connector/connectortest/connector.go b/connector/connectortest/connector.go index 0aad0b71142..144b4dff110 100644 --- a/connector/connectortest/connector.go +++ b/connector/connectortest/connector.go @@ -18,8 +18,15 @@ import ( var nopType = component.MustNewType("nop") // NewNopCreateSettings returns a new nop settings for Create* functions. -func NewNopCreateSettings() connector.CreateSettings { - return connector.CreateSettings{ +// +// Deprecated: [v0.103.0] Use connectortest.NewNopSettings instead. +func NewNopCreateSettings() connector.Settings { + return NewNopSettings() +} + +// NewNopSettings returns a new nop settings for Create* functions. +func NewNopSettings() connector.Settings { + return connector.Settings{ ID: component.NewIDWithName(nopType, uuid.NewString()), TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), @@ -47,39 +54,39 @@ func NewNopFactory() connector.Factory { ) } -func createTracesToTracesConnector(context.Context, connector.CreateSettings, component.Config, consumer.Traces) (connector.Traces, error) { +func createTracesToTracesConnector(context.Context, connector.Settings, component.Config, consumer.Traces) (connector.Traces, error) { return &nopConnector{Consumer: consumertest.NewNop()}, nil } -func createTracesToMetricsConnector(context.Context, connector.CreateSettings, component.Config, consumer.Metrics) (connector.Traces, error) { +func createTracesToMetricsConnector(context.Context, connector.Settings, component.Config, consumer.Metrics) (connector.Traces, error) { return &nopConnector{Consumer: consumertest.NewNop()}, nil } -func createTracesToLogsConnector(context.Context, connector.CreateSettings, component.Config, consumer.Logs) (connector.Traces, error) { +func createTracesToLogsConnector(context.Context, connector.Settings, component.Config, consumer.Logs) (connector.Traces, error) { return &nopConnector{Consumer: consumertest.NewNop()}, nil } -func createMetricsToTracesConnector(context.Context, connector.CreateSettings, component.Config, consumer.Traces) (connector.Metrics, error) { +func createMetricsToTracesConnector(context.Context, connector.Settings, component.Config, consumer.Traces) (connector.Metrics, error) { return &nopConnector{Consumer: consumertest.NewNop()}, nil } -func createMetricsToMetricsConnector(context.Context, connector.CreateSettings, component.Config, consumer.Metrics) (connector.Metrics, error) { +func createMetricsToMetricsConnector(context.Context, connector.Settings, component.Config, consumer.Metrics) (connector.Metrics, error) { return &nopConnector{Consumer: consumertest.NewNop()}, nil } -func createMetricsToLogsConnector(context.Context, connector.CreateSettings, component.Config, consumer.Logs) (connector.Metrics, error) { +func createMetricsToLogsConnector(context.Context, connector.Settings, component.Config, consumer.Logs) (connector.Metrics, error) { return &nopConnector{Consumer: consumertest.NewNop()}, nil } -func createLogsToTracesConnector(context.Context, connector.CreateSettings, component.Config, consumer.Traces) (connector.Logs, error) { +func createLogsToTracesConnector(context.Context, connector.Settings, component.Config, consumer.Traces) (connector.Logs, error) { return &nopConnector{Consumer: consumertest.NewNop()}, nil } -func createLogsToMetricsConnector(context.Context, connector.CreateSettings, component.Config, consumer.Metrics) (connector.Logs, error) { +func createLogsToMetricsConnector(context.Context, connector.Settings, component.Config, consumer.Metrics) (connector.Logs, error) { return &nopConnector{Consumer: consumertest.NewNop()}, nil } -func createLogsToLogsConnector(context.Context, connector.CreateSettings, component.Config, consumer.Logs) (connector.Logs, error) { +func createLogsToLogsConnector(context.Context, connector.Settings, component.Config, consumer.Logs) (connector.Logs, error) { return &nopConnector{Consumer: consumertest.NewNop()}, nil } diff --git a/connector/connectortest/connector_test.go b/connector/connectortest/connector_test.go index 4a2894f8544..244f7663b15 100644 --- a/connector/connectortest/connector_test.go +++ b/connector/connectortest/connector_test.go @@ -25,55 +25,55 @@ func TestNewNopConnectorFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &nopConfig{}, cfg) - tracesToTraces, err := factory.CreateTracesToTraces(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + tracesToTraces, err := factory.CreateTracesToTraces(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, tracesToTraces.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, tracesToTraces.ConsumeTraces(context.Background(), ptrace.NewTraces())) assert.NoError(t, tracesToTraces.Shutdown(context.Background())) - tracesToMetrics, err := factory.CreateTracesToMetrics(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + tracesToMetrics, err := factory.CreateTracesToMetrics(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, tracesToMetrics.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, tracesToMetrics.ConsumeTraces(context.Background(), ptrace.NewTraces())) assert.NoError(t, tracesToMetrics.Shutdown(context.Background())) - tracesToLogs, err := factory.CreateTracesToLogs(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + tracesToLogs, err := factory.CreateTracesToLogs(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, tracesToLogs.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, tracesToLogs.ConsumeTraces(context.Background(), ptrace.NewTraces())) assert.NoError(t, tracesToLogs.Shutdown(context.Background())) - metricsToTraces, err := factory.CreateMetricsToTraces(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + metricsToTraces, err := factory.CreateMetricsToTraces(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, metricsToTraces.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, metricsToTraces.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) assert.NoError(t, metricsToTraces.Shutdown(context.Background())) - metricsToMetrics, err := factory.CreateMetricsToMetrics(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + metricsToMetrics, err := factory.CreateMetricsToMetrics(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, metricsToMetrics.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, metricsToMetrics.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) assert.NoError(t, metricsToMetrics.Shutdown(context.Background())) - metricsToLogs, err := factory.CreateMetricsToLogs(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + metricsToLogs, err := factory.CreateMetricsToLogs(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, metricsToLogs.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, metricsToLogs.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) assert.NoError(t, metricsToLogs.Shutdown(context.Background())) - logsToTraces, err := factory.CreateLogsToTraces(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + logsToTraces, err := factory.CreateLogsToTraces(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, logsToTraces.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, logsToTraces.ConsumeLogs(context.Background(), plog.NewLogs())) assert.NoError(t, logsToTraces.Shutdown(context.Background())) - logsToMetrics, err := factory.CreateLogsToMetrics(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + logsToMetrics, err := factory.CreateLogsToMetrics(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, logsToMetrics.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, logsToMetrics.ConsumeLogs(context.Background(), plog.NewLogs())) assert.NoError(t, logsToMetrics.Shutdown(context.Background())) - logsToLogs, err := factory.CreateLogsToLogs(context.Background(), NewNopCreateSettings(), cfg, consumertest.NewNop()) + logsToLogs, err := factory.CreateLogsToLogs(context.Background(), NewNopSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) assert.NoError(t, logsToLogs.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, logsToLogs.ConsumeLogs(context.Background(), plog.NewLogs())) @@ -86,7 +86,7 @@ func TestNewNopBuilder(t *testing.T) { factory := NewNopFactory() cfg := factory.CreateDefaultConfig() - set := NewNopCreateSettings() + set := NewNopSettings() set.ID = component.NewIDWithName(nopType, "conn") tracesToTraces, err := factory.CreateTracesToTraces(context.Background(), set, cfg, consumertest.NewNop()) diff --git a/connector/forwardconnector/forward.go b/connector/forwardconnector/forward.go index a34cd15bd09..83914a05f33 100644 --- a/connector/forwardconnector/forward.go +++ b/connector/forwardconnector/forward.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { // createTracesToTraces creates a trace receiver based on provided config. func createTracesToTraces( _ context.Context, - _ connector.CreateSettings, + _ connector.Settings, _ component.Config, nextConsumer consumer.Traces, ) (connector.Traces, error) { @@ -43,7 +43,7 @@ func createTracesToTraces( // createMetricsToMetrics creates a metrics receiver based on provided config. func createMetricsToMetrics( _ context.Context, - _ connector.CreateSettings, + _ connector.Settings, _ component.Config, nextConsumer consumer.Metrics, ) (connector.Metrics, error) { @@ -53,7 +53,7 @@ func createMetricsToMetrics( // createLogsToLogs creates a log receiver based on provided config. func createLogsToLogs( _ context.Context, - _ connector.CreateSettings, + _ connector.Settings, _ component.Config, nextConsumer consumer.Logs, ) (connector.Logs, error) { diff --git a/connector/forwardconnector/forward_test.go b/connector/forwardconnector/forward_test.go index 3ce18c4f530..f21711d0160 100644 --- a/connector/forwardconnector/forward_test.go +++ b/connector/forwardconnector/forward_test.go @@ -22,7 +22,7 @@ func TestForward(t *testing.T) { assert.Equal(t, &Config{}, cfg) ctx := context.Background() - set := connectortest.NewNopCreateSettings() + set := connectortest.NewNopSettings() host := componenttest.NewNopHost() tracesSink := new(consumertest.TracesSink) diff --git a/connector/forwardconnector/generated_component_test.go b/connector/forwardconnector/generated_component_test.go index 9371aa5a2b2..ec49a1d505d 100644 --- a/connector/forwardconnector/generated_component_test.go +++ b/connector/forwardconnector/generated_component_test.go @@ -30,12 +30,12 @@ func TestComponentLifecycle(t *testing.T) { tests := []struct { name string - createFn func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) + createFn func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) }{ { name: "logs_to_logs", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewLogsRouter(map[component.ID]consumer.Logs{component.NewID(component.DataTypeLogs): consumertest.NewNop()}) return factory.CreateLogsToLogs(ctx, set, cfg, router) }, @@ -43,7 +43,7 @@ func TestComponentLifecycle(t *testing.T) { { name: "metrics_to_metrics", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewMetricsRouter(map[component.ID]consumer.Metrics{component.NewID(component.DataTypeMetrics): consumertest.NewNop()}) return factory.CreateMetricsToMetrics(ctx, set, cfg, router) }, @@ -51,7 +51,7 @@ func TestComponentLifecycle(t *testing.T) { { name: "traces_to_traces", - createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { router := connector.NewTracesRouter(map[component.ID]consumer.Traces{component.NewID(component.DataTypeTraces): consumertest.NewNop()}) return factory.CreateTracesToTraces(ctx, set, cfg, router) }, @@ -67,19 +67,19 @@ func TestComponentLifecycle(t *testing.T) { for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + c, err := test.createFn(context.Background(), connectortest.NewNopSettings(), cfg) require.NoError(t, err) err = c.Shutdown(context.Background()) require.NoError(t, err) }) t.Run(test.name+"-lifecycle", func(t *testing.T) { - firstConnector, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + firstConnector, err := test.createFn(context.Background(), connectortest.NewNopSettings(), cfg) require.NoError(t, err) host := componenttest.NewNopHost() require.NoError(t, err) require.NoError(t, firstConnector.Start(context.Background(), host)) require.NoError(t, firstConnector.Shutdown(context.Background())) - secondConnector, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + secondConnector, err := test.createFn(context.Background(), connectortest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondConnector.Start(context.Background(), host)) require.NoError(t, secondConnector.Shutdown(context.Background())) diff --git a/service/internal/graph/graph_test.go b/service/internal/graph/graph_test.go index 561aa77fb95..575f93cab89 100644 --- a/service/internal/graph/graph_test.go +++ b/service/internal/graph/graph_test.go @@ -2502,33 +2502,33 @@ func newErrConnectorFactory() connector.Factory { return connector.NewFactory(component.MustNewType("err"), func() component.Config { return &struct{}{} }, - connector.WithTracesToTraces(func(context.Context, connector.CreateSettings, component.Config, consumer.Traces) (connector.Traces, error) { + connector.WithTracesToTraces(func(context.Context, connector.Settings, component.Config, consumer.Traces) (connector.Traces, error) { return &errComponent{}, nil }, component.StabilityLevelUnmaintained), - connector.WithTracesToMetrics(func(context.Context, connector.CreateSettings, component.Config, consumer.Metrics) (connector.Traces, error) { + connector.WithTracesToMetrics(func(context.Context, connector.Settings, component.Config, consumer.Metrics) (connector.Traces, error) { return &errComponent{}, nil }, component.StabilityLevelUnmaintained), - connector.WithTracesToLogs(func(context.Context, connector.CreateSettings, component.Config, consumer.Logs) (connector.Traces, error) { + connector.WithTracesToLogs(func(context.Context, connector.Settings, component.Config, consumer.Logs) (connector.Traces, error) { return &errComponent{}, nil }, component.StabilityLevelUnmaintained), - connector.WithMetricsToTraces(func(context.Context, connector.CreateSettings, component.Config, consumer.Traces) (connector.Metrics, error) { + connector.WithMetricsToTraces(func(context.Context, connector.Settings, component.Config, consumer.Traces) (connector.Metrics, error) { return &errComponent{}, nil }, component.StabilityLevelUnmaintained), - connector.WithMetricsToMetrics(func(context.Context, connector.CreateSettings, component.Config, consumer.Metrics) (connector.Metrics, error) { + connector.WithMetricsToMetrics(func(context.Context, connector.Settings, component.Config, consumer.Metrics) (connector.Metrics, error) { return &errComponent{}, nil }, component.StabilityLevelUnmaintained), - connector.WithMetricsToLogs(func(context.Context, connector.CreateSettings, component.Config, consumer.Logs) (connector.Metrics, error) { + connector.WithMetricsToLogs(func(context.Context, connector.Settings, component.Config, consumer.Logs) (connector.Metrics, error) { return &errComponent{}, nil }, component.StabilityLevelUnmaintained), - connector.WithLogsToTraces(func(context.Context, connector.CreateSettings, component.Config, consumer.Traces) (connector.Logs, error) { + connector.WithLogsToTraces(func(context.Context, connector.Settings, component.Config, consumer.Traces) (connector.Logs, error) { return &errComponent{}, nil }, component.StabilityLevelUnmaintained), - connector.WithLogsToMetrics(func(context.Context, connector.CreateSettings, component.Config, consumer.Metrics) (connector.Logs, error) { + connector.WithLogsToMetrics(func(context.Context, connector.Settings, component.Config, consumer.Metrics) (connector.Logs, error) { return &errComponent{}, nil }, component.StabilityLevelUnmaintained), - connector.WithLogsToLogs(func(context.Context, connector.CreateSettings, component.Config, consumer.Logs) (connector.Logs, error) { + connector.WithLogsToLogs(func(context.Context, connector.Settings, component.Config, consumer.Logs) (connector.Logs, error) { return &errComponent{}, nil }, component.StabilityLevelUnmaintained), ) diff --git a/service/internal/graph/nodes.go b/service/internal/graph/nodes.go index acbd43c8969..9edb700b242 100644 --- a/service/internal/graph/nodes.go +++ b/service/internal/graph/nodes.go @@ -233,7 +233,7 @@ func (n *connectorNode) buildComponent( builder *connector.Builder, nexts []baseConsumer, ) error { - set := connector.CreateSettings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info} + set := connector.Settings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info} set.TelemetrySettings.Logger = components.ConnectorLogger(set.TelemetrySettings.Logger, n.componentID, n.exprPipelineType, n.rcvrPipelineType) switch n.rcvrPipelineType { diff --git a/service/internal/testcomponents/example_connector.go b/service/internal/testcomponents/example_connector.go index a521389cf80..8514159dedf 100644 --- a/service/internal/testcomponents/example_connector.go +++ b/service/internal/testcomponents/example_connector.go @@ -47,14 +47,14 @@ func createExampleConnectorDefaultConfig() component.Config { return &struct{}{} } -func createExampleTracesToTraces(_ context.Context, set connector.CreateSettings, _ component.Config, traces consumer.Traces) (connector.Traces, error) { +func createExampleTracesToTraces(_ context.Context, set connector.Settings, _ component.Config, traces consumer.Traces) (connector.Traces, error) { return &ExampleConnector{ ConsumeTracesFunc: traces.ConsumeTraces, mutatesData: set.ID.Name() == "mutate", }, nil } -func createExampleTracesToMetrics(_ context.Context, set connector.CreateSettings, _ component.Config, metrics consumer.Metrics) (connector.Traces, error) { +func createExampleTracesToMetrics(_ context.Context, set connector.Settings, _ component.Config, metrics consumer.Metrics) (connector.Traces, error) { return &ExampleConnector{ ConsumeTracesFunc: func(ctx context.Context, td ptrace.Traces) error { return metrics.ConsumeMetrics(ctx, testdata.GenerateMetrics(td.SpanCount())) @@ -63,7 +63,7 @@ func createExampleTracesToMetrics(_ context.Context, set connector.CreateSetting }, nil } -func createExampleTracesToLogs(_ context.Context, set connector.CreateSettings, _ component.Config, logs consumer.Logs) (connector.Traces, error) { +func createExampleTracesToLogs(_ context.Context, set connector.Settings, _ component.Config, logs consumer.Logs) (connector.Traces, error) { return &ExampleConnector{ ConsumeTracesFunc: func(ctx context.Context, td ptrace.Traces) error { return logs.ConsumeLogs(ctx, testdata.GenerateLogs(td.SpanCount())) @@ -72,7 +72,7 @@ func createExampleTracesToLogs(_ context.Context, set connector.CreateSettings, }, nil } -func createExampleMetricsToTraces(_ context.Context, set connector.CreateSettings, _ component.Config, traces consumer.Traces) (connector.Metrics, error) { +func createExampleMetricsToTraces(_ context.Context, set connector.Settings, _ component.Config, traces consumer.Traces) (connector.Metrics, error) { return &ExampleConnector{ ConsumeMetricsFunc: func(ctx context.Context, md pmetric.Metrics) error { return traces.ConsumeTraces(ctx, testdata.GenerateTraces(md.MetricCount())) @@ -81,14 +81,14 @@ func createExampleMetricsToTraces(_ context.Context, set connector.CreateSetting }, nil } -func createExampleMetricsToMetrics(_ context.Context, set connector.CreateSettings, _ component.Config, metrics consumer.Metrics) (connector.Metrics, error) { +func createExampleMetricsToMetrics(_ context.Context, set connector.Settings, _ component.Config, metrics consumer.Metrics) (connector.Metrics, error) { return &ExampleConnector{ ConsumeMetricsFunc: metrics.ConsumeMetrics, mutatesData: set.ID.Name() == "mutate", }, nil } -func createExampleMetricsToLogs(_ context.Context, set connector.CreateSettings, _ component.Config, logs consumer.Logs) (connector.Metrics, error) { +func createExampleMetricsToLogs(_ context.Context, set connector.Settings, _ component.Config, logs consumer.Logs) (connector.Metrics, error) { return &ExampleConnector{ ConsumeMetricsFunc: func(ctx context.Context, md pmetric.Metrics) error { return logs.ConsumeLogs(ctx, testdata.GenerateLogs(md.MetricCount())) @@ -97,7 +97,7 @@ func createExampleMetricsToLogs(_ context.Context, set connector.CreateSettings, }, nil } -func createExampleLogsToTraces(_ context.Context, set connector.CreateSettings, _ component.Config, traces consumer.Traces) (connector.Logs, error) { +func createExampleLogsToTraces(_ context.Context, set connector.Settings, _ component.Config, traces consumer.Traces) (connector.Logs, error) { return &ExampleConnector{ ConsumeLogsFunc: func(ctx context.Context, ld plog.Logs) error { return traces.ConsumeTraces(ctx, testdata.GenerateTraces(ld.LogRecordCount())) @@ -106,7 +106,7 @@ func createExampleLogsToTraces(_ context.Context, set connector.CreateSettings, }, nil } -func createExampleLogsToMetrics(_ context.Context, set connector.CreateSettings, _ component.Config, metrics consumer.Metrics) (connector.Logs, error) { +func createExampleLogsToMetrics(_ context.Context, set connector.Settings, _ component.Config, metrics consumer.Metrics) (connector.Logs, error) { return &ExampleConnector{ ConsumeLogsFunc: func(ctx context.Context, ld plog.Logs) error { return metrics.ConsumeMetrics(ctx, testdata.GenerateMetrics(ld.LogRecordCount())) @@ -115,7 +115,7 @@ func createExampleLogsToMetrics(_ context.Context, set connector.CreateSettings, }, nil } -func createExampleLogsToLogs(_ context.Context, set connector.CreateSettings, _ component.Config, logs consumer.Logs) (connector.Logs, error) { +func createExampleLogsToLogs(_ context.Context, set connector.Settings, _ component.Config, logs consumer.Logs) (connector.Logs, error) { return &ExampleConnector{ ConsumeLogsFunc: logs.ConsumeLogs, mutatesData: set.ID.Name() == "mutate", diff --git a/service/internal/testcomponents/example_router.go b/service/internal/testcomponents/example_router.go index 3eafbf13cb6..6d7211c89e8 100644 --- a/service/internal/testcomponents/example_router.go +++ b/service/internal/testcomponents/example_router.go @@ -40,7 +40,7 @@ func createExampleRouterDefaultConfig() component.Config { return &ExampleRouterConfig{} } -func createExampleTracesRouter(_ context.Context, _ connector.CreateSettings, cfg component.Config, traces consumer.Traces) (connector.Traces, error) { +func createExampleTracesRouter(_ context.Context, _ connector.Settings, cfg component.Config, traces consumer.Traces) (connector.Traces, error) { c := cfg.(ExampleRouterConfig) r := traces.(connector.TracesRouterAndConsumer) left, _ := r.Consumer(c.Traces.Left) @@ -51,7 +51,7 @@ func createExampleTracesRouter(_ context.Context, _ connector.CreateSettings, cf }, nil } -func createExampleMetricsRouter(_ context.Context, _ connector.CreateSettings, cfg component.Config, metrics consumer.Metrics) (connector.Metrics, error) { +func createExampleMetricsRouter(_ context.Context, _ connector.Settings, cfg component.Config, metrics consumer.Metrics) (connector.Metrics, error) { c := cfg.(ExampleRouterConfig) r := metrics.(connector.MetricsRouterAndConsumer) left, _ := r.Consumer(c.Metrics.Left) @@ -62,7 +62,7 @@ func createExampleMetricsRouter(_ context.Context, _ connector.CreateSettings, c }, nil } -func createExampleLogsRouter(_ context.Context, _ connector.CreateSettings, cfg component.Config, logs consumer.Logs) (connector.Logs, error) { +func createExampleLogsRouter(_ context.Context, _ connector.Settings, cfg component.Config, logs consumer.Logs) (connector.Logs, error) { c := cfg.(ExampleRouterConfig) r := logs.(connector.LogsRouterAndConsumer) left, _ := r.Consumer(c.Logs.Left) diff --git a/service/internal/testcomponents/example_router_test.go b/service/internal/testcomponents/example_router_test.go index 2f44e04902d..f868b99543b 100644 --- a/service/internal/testcomponents/example_router_test.go +++ b/service/internal/testcomponents/example_router_test.go @@ -48,7 +48,7 @@ func TestTracesRouter(t *testing.T) { cfg := ExampleRouterConfig{Traces: &LeftRightConfig{Left: leftID, Right: rightID}} tr, err := ExampleRouterFactory.CreateTracesToTraces( - context.Background(), connectortest.NewNopCreateSettings(), cfg, router) + context.Background(), connectortest.NewNopSettings(), cfg, router) assert.NoError(t, err) assert.False(t, tr.Capabilities().MutatesData) @@ -87,7 +87,7 @@ func TestMetricsRouter(t *testing.T) { cfg := ExampleRouterConfig{Metrics: &LeftRightConfig{Left: leftID, Right: rightID}} mr, err := ExampleRouterFactory.CreateMetricsToMetrics( - context.Background(), connectortest.NewNopCreateSettings(), cfg, router) + context.Background(), connectortest.NewNopSettings(), cfg, router) assert.NoError(t, err) assert.False(t, mr.Capabilities().MutatesData) @@ -126,7 +126,7 @@ func TestLogsRouter(t *testing.T) { cfg := ExampleRouterConfig{Logs: &LeftRightConfig{Left: leftID, Right: rightID}} lr, err := ExampleRouterFactory.CreateLogsToLogs( - context.Background(), connectortest.NewNopCreateSettings(), cfg, router) + context.Background(), connectortest.NewNopSettings(), cfg, router) assert.NoError(t, err) assert.False(t, lr.Capabilities().MutatesData) From 1912879c1946f59ddca27876af86bd43e14b4bfc Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 6 Jun 2024 10:05:26 -0700 Subject: [PATCH 046/168] [component] Remove deprecated `component.UnmarshalConfig` (#10340) #### Description Remove deprecated `component.UnmarshalConfig` #### Link to tracking issue Fixes #7102 Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .chloggen/remove_unmarshalconfig.yaml | 25 +++++++++++++++++++++++++ component/config.go | 8 -------- component/config_test.go | 27 --------------------------- component/go.mod | 9 --------- component/go.sum | 12 ------------ connector/go.mod | 7 ------- connector/go.sum | 12 ------------ processor/go.mod | 7 ------- processor/go.sum | 12 ------------ receiver/go.mod | 7 ------- receiver/go.sum | 12 ------------ 11 files changed, 25 insertions(+), 113 deletions(-) create mode 100644 .chloggen/remove_unmarshalconfig.yaml diff --git a/.chloggen/remove_unmarshalconfig.yaml b/.chloggen/remove_unmarshalconfig.yaml new file mode 100644 index 00000000000..b8a0ec5bec5 --- /dev/null +++ b/.chloggen/remove_unmarshalconfig.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: component + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove deprecated `component.UnmarshalConfig` + +# One or more tracking issues or pull requests related to the change +issues: [7102] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/component/config.go b/component/config.go index 6d4dbea1c32..b961d1fdb1f 100644 --- a/component/config.go +++ b/component/config.go @@ -9,8 +9,6 @@ import ( "regexp" "go.uber.org/multierr" - - "go.opentelemetry.io/collector/confmap" ) // Config defines the configuration for a component.Component. @@ -26,12 +24,6 @@ type Config any // for an interface type Foo is to use a *Foo value. var configValidatorType = reflect.TypeOf((*ConfigValidator)(nil)).Elem() -// UnmarshalConfig helper function to UnmarshalConfig a Config. -// Deprecated: [v0.101.0] Use conf.Unmarshal(&intoCfg) -func UnmarshalConfig(conf *confmap.Conf, intoCfg Config) error { - return conf.Unmarshal(intoCfg) -} - // ConfigValidator defines an optional interface for configurations to implement to do validation. type ConfigValidator interface { // Validate the configuration and returns an error if invalid. diff --git a/component/config_test.go b/component/config_test.go index caed4dc20ab..f47a9edc87c 100644 --- a/component/config_test.go +++ b/component/config_test.go @@ -12,8 +12,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - "go.opentelemetry.io/collector/confmap" ) var _ fmt.Stringer = Type{} @@ -422,28 +420,3 @@ func TestNewType(t *testing.T) { }) } } - -type configWithEmbeddedStruct struct { - String string `mapstructure:"string"` - Num int `mapstructure:"num"` - embeddedUnmarshallingConfig -} - -type embeddedUnmarshallingConfig struct { -} - -func (euc *embeddedUnmarshallingConfig) Unmarshal(_ *confmap.Conf) error { - return nil // do nothing. -} -func TestStructWithEmbeddedUnmarshaling(t *testing.T) { - t.Skip("Skipping, to be fixed with https://github.com/open-telemetry/opentelemetry-collector/issues/7102") - cfgMap := confmap.NewFromStringMap(map[string]any{ - "string": "foo", - "num": 123, - }) - tc := &configWithEmbeddedStruct{} - err := UnmarshalConfig(cfgMap, tc) - require.NoError(t, err) - assert.Equal(t, "foo", tc.String) - assert.Equal(t, 123, tc.Num) -} diff --git a/component/go.mod b/component/go.mod index d46317a515d..a870abba8d2 100644 --- a/component/go.mod +++ b/component/go.mod @@ -8,7 +8,6 @@ require ( github.com/prometheus/common v0.54.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/exporters/prometheus v0.49.0 @@ -27,13 +26,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - 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.1.1 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect golang.org/x/net v0.24.0 // indirect @@ -47,8 +40,6 @@ require ( replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry -replace go.opentelemetry.io/collector/confmap => ../confmap - replace go.opentelemetry.io/collector/pdata => ../pdata retract ( diff --git a/component/go.sum b/component/go.sum index 000c077e9bc..ec205ab4aba 100644 --- a/component/go.sum +++ b/component/go.sum @@ -9,28 +9,16 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 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/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/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= -github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= -github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= -github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= -github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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/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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= diff --git a/connector/go.mod b/connector/go.mod index 5c29cfed35c..c636056da7c 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -21,14 +21,8 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/json-iterator/go v1.1.12 // indirect - 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.1.1 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -37,7 +31,6 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/connector/go.sum b/connector/go.sum index ace4d10d26a..aaa6afbf77b 100644 --- a/connector/go.sum +++ b/connector/go.sum @@ -10,8 +10,6 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -23,20 +21,10 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= 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/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= -github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= -github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= -github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= -github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= -github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= 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= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= diff --git a/processor/go.mod b/processor/go.mod index 339cd231cd3..eb908c75d49 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -25,14 +25,8 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/json-iterator/go v1.1.12 // indirect - 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.1.1 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -40,7 +34,6 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/go.sum b/processor/go.sum index ace4d10d26a..aaa6afbf77b 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -10,8 +10,6 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -23,20 +21,10 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= 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/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= -github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= -github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= -github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= -github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= -github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= 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= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= diff --git a/receiver/go.mod b/receiver/go.mod index 0972d5dcbd0..e40ddd8725b 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -26,14 +26,8 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/json-iterator/go v1.1.12 // indirect - 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.1.1 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -41,7 +35,6 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/sys v0.20.0 // indirect diff --git a/receiver/go.sum b/receiver/go.sum index ace4d10d26a..aaa6afbf77b 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -10,8 +10,6 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -23,20 +21,10 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= 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/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= -github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= -github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= -github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= -github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= -github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= 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= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= From cf0b959a79681962c7a98f81413df9863443ac88 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:33:25 -0700 Subject: [PATCH 047/168] [extension] deprecate CreateSettings -> Settings (#10339) This deprecates CreateSettings in favour of Settings. NewNopCreateSettings is also being deprecated in favour of NewNopSettings Part of #9428 Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_create-settings-extension.yaml | 28 +++++++++++++++++++ .../component_telemetry_test.go.tmpl | 11 -------- cmd/mdatagen/templates/component_test.go.tmpl | 6 ++-- .../internal/queue/persistent_queue_test.go | 2 +- extension/ballastextension/factory.go | 2 +- extension/ballastextension/factory_test.go | 4 +-- .../generated_component_test.go | 6 ++-- extension/extension.go | 15 ++++++---- extension/extension_test.go | 16 +++++------ extension/extensiontest/nop_extension.go | 13 +++++++-- extension/extensiontest/nop_extension_test.go | 4 +-- .../extensiontest/statuswatcher_extension.go | 6 ++-- extension/memorylimiterextension/factory.go | 2 +- .../memorylimiterextension/factory_test.go | 2 +- .../generated_component_test.go | 4 +-- extension/zpagesextension/factory.go | 2 +- extension/zpagesextension/factory_test.go | 4 +-- .../generated_component_test.go | 6 ++-- service/extensions/extensions.go | 2 +- service/extensions/extensions_test.go | 22 +++++++-------- service/service_test.go | 2 +- 21 files changed, 94 insertions(+), 65 deletions(-) create mode 100644 .chloggen/codeboten_create-settings-extension.yaml diff --git a/.chloggen/codeboten_create-settings-extension.yaml b/.chloggen/codeboten_create-settings-extension.yaml new file mode 100644 index 00000000000..e882d026ab1 --- /dev/null +++ b/.chloggen/codeboten_create-settings-extension.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: extension + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate CreateSettings and NewNopCreateSettings + +# One or more tracking issues or pull requests related to the change +issues: [9428] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The following methods are being renamed: + - extension.CreateSettings -> extension.Settings + - extension.NewNopCreateSettings -> extension.NewNopSettings + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl index 5ee950c270f..33372616141 100644 --- a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl +++ b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl @@ -21,7 +21,6 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } -{{- if (or isExporter isReceiver isProcessor isConnector) }} func (tt *componentTestTelemetry) NewSettings() {{ .Status.Class }}.Settings { settings := {{ .Status.Class }}test.NewNopSettings() settings.MeterProvider = tt.meterProvider @@ -30,16 +29,6 @@ func (tt *componentTestTelemetry) NewSettings() {{ .Status.Class }}.Settings { return settings } -{{ else }} -func (tt *componentTestTelemetry) NewCreateSettings() {{ .Status.Class }}.CreateSettings { - settings := {{ .Status.Class }}test.NewNopCreateSettings() - settings.MeterProvider = tt.meterProvider - settings.ID = component.NewID(component.MustNewType("{{ .Type }}")) - - return settings -} - -{{ end }} func setupTestTelemetry() componentTestTelemetry { reader := sdkmetric.NewManualReader() return componentTestTelemetry{ diff --git a/cmd/mdatagen/templates/component_test.go.tmpl b/cmd/mdatagen/templates/component_test.go.tmpl index 45106fe65d4..45deb99e545 100644 --- a/cmd/mdatagen/templates/component_test.go.tmpl +++ b/cmd/mdatagen/templates/component_test.go.tmpl @@ -337,7 +337,7 @@ func TestComponentLifecycle(t *testing.T) { {{- if not .Tests.SkipShutdown }} t.Run("shutdown", func(t *testing.T) { - e, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + e, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) err = e.Shutdown(context.Background()) require.NoError(t, err) @@ -346,12 +346,12 @@ func TestComponentLifecycle(t *testing.T) { {{- if not .Tests.SkipLifecycle }} t.Run("lifecycle", func(t *testing.T) { - firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, firstExt.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, firstExt.Shutdown(context.Background())) - secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondExt.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, secondExt.Shutdown(context.Background())) diff --git a/exporter/internal/queue/persistent_queue_test.go b/exporter/internal/queue/persistent_queue_test.go index ee3bc7b7c5f..f226e35c430 100644 --- a/exporter/internal/queue/persistent_queue_test.go +++ b/exporter/internal/queue/persistent_queue_test.go @@ -324,7 +324,7 @@ func TestInvalidStorageExtensionType(t *testing.T) { // make a test extension factory := extensiontest.NewNopFactory() extConfig := factory.CreateDefaultConfig() - settings := extensiontest.NewNopCreateSettings() + settings := extensiontest.NewNopSettings() extension, err := factory.CreateExtension(context.Background(), settings, extConfig) assert.NoError(t, err) var extensions = map[component.ID]component.Component{ diff --git a/extension/ballastextension/factory.go b/extension/ballastextension/factory.go index b1742d9081b..730950da7d4 100644 --- a/extension/ballastextension/factory.go +++ b/extension/ballastextension/factory.go @@ -26,6 +26,6 @@ func createDefaultConfig() component.Config { return &Config{} } -func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) { +func createExtension(_ context.Context, set extension.Settings, cfg component.Config) (extension.Extension, error) { return newMemoryBallast(cfg.(*Config), set.TelemetrySettings.Logger, memHandler), nil } diff --git a/extension/ballastextension/factory_test.go b/extension/ballastextension/factory_test.go index 810d093cd86..0c9e91f8224 100644 --- a/extension/ballastextension/factory_test.go +++ b/extension/ballastextension/factory_test.go @@ -19,14 +19,14 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { assert.Equal(t, &Config{}, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) - ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } func TestFactory_CreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) - ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } diff --git a/extension/ballastextension/generated_component_test.go b/extension/ballastextension/generated_component_test.go index 2e685378c41..d70b7d0498d 100644 --- a/extension/ballastextension/generated_component_test.go +++ b/extension/ballastextension/generated_component_test.go @@ -31,18 +31,18 @@ func TestComponentLifecycle(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(&cfg)) t.Run("shutdown", func(t *testing.T) { - e, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + e, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) err = e.Shutdown(context.Background()) require.NoError(t, err) }) t.Run("lifecycle", func(t *testing.T) { - firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, firstExt.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, firstExt.Shutdown(context.Background())) - secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondExt.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, secondExt.Shutdown(context.Background())) diff --git a/extension/extension.go b/extension/extension.go index 292358b33ba..8ee61a422cc 100644 --- a/extension/extension.go +++ b/extension/extension.go @@ -63,7 +63,12 @@ type StatusWatcher interface { } // CreateSettings is passed to Factory.Create(...) function. -type CreateSettings struct { +// +// Deprecated: [v0.103.0] Use extension.Settings instead. +type CreateSettings = Settings + +// Settings is passed to Factory.Create(...) function. +type Settings struct { // ID returns the ID of the component that will be created. ID component.ID @@ -74,10 +79,10 @@ type CreateSettings struct { } // CreateFunc is the equivalent of Factory.Create(...) function. -type CreateFunc func(context.Context, CreateSettings, component.Config) (Extension, error) +type CreateFunc func(context.Context, Settings, component.Config) (Extension, error) // CreateExtension implements Factory.Create. -func (f CreateFunc) CreateExtension(ctx context.Context, set CreateSettings, cfg component.Config) (Extension, error) { +func (f CreateFunc) CreateExtension(ctx context.Context, set Settings, cfg component.Config) (Extension, error) { return f(ctx, set, cfg) } @@ -85,7 +90,7 @@ type Factory interface { component.Factory // CreateExtension creates an extension based on the given config. - CreateExtension(ctx context.Context, set CreateSettings, cfg component.Config) (Extension, error) + CreateExtension(ctx context.Context, set Settings, cfg component.Config) (Extension, error) // ExtensionStability gets the stability level of the Extension. ExtensionStability() component.StabilityLevel @@ -149,7 +154,7 @@ func NewBuilder(cfgs map[component.ID]component.Config, factories map[component. } // Create creates an extension based on the settings and configs available. -func (b *Builder) Create(ctx context.Context, set CreateSettings) (Extension, error) { +func (b *Builder) Create(ctx context.Context, set Settings) (Extension, error) { cfg, existsCfg := b.cfgs[set.ID] if !existsCfg { return nil, fmt.Errorf("extension %q is not configured", set.ID) diff --git a/extension/extension_test.go b/extension/extension_test.go index d3dbf80c8c3..3c4b2968667 100644 --- a/extension/extension_test.go +++ b/extension/extension_test.go @@ -17,7 +17,7 @@ import ( type nopExtension struct { component.StartFunc component.ShutdownFunc - CreateSettings + Settings } func TestNewFactory(t *testing.T) { @@ -28,7 +28,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory( testType, func() component.Config { return &defaultCfg }, - func(context.Context, CreateSettings, component.Config) (Extension, error) { + func(context.Context, Settings, component.Config) (Extension, error) { return nopExtensionInstance, nil }, component.StabilityLevelDevelopment) @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) assert.Equal(t, component.StabilityLevelDevelopment, factory.ExtensionStability()) - ext, err := factory.CreateExtension(context.Background(), CreateSettings{}, &defaultCfg) + ext, err := factory.CreateExtension(context.Background(), Settings{}, &defaultCfg) assert.NoError(t, err) assert.Same(t, nopExtensionInstance, ext) } @@ -88,8 +88,8 @@ func TestBuilder(t *testing.T) { NewFactory( testType, func() component.Config { return &defaultCfg }, - func(_ context.Context, settings CreateSettings, _ component.Config) (Extension, error) { - return nopExtension{CreateSettings: settings}, nil + func(_ context.Context, settings Settings, _ component.Config) (Extension, error) { + return nopExtension{Settings: settings}, nil }, component.StabilityLevelDevelopment), }...) @@ -105,7 +105,7 @@ func TestBuilder(t *testing.T) { // Check that the extension has access to the resource attributes. nop, ok := e.(nopExtension) assert.True(t, ok) - assert.Equal(t, nop.CreateSettings.Resource.Attributes().Len(), 0) + assert.Equal(t, nop.Settings.Resource.Attributes().Len(), 0) missingType, err := b.Create(context.Background(), createSettings(unknownID)) assert.EqualError(t, err, "extension factory not available for: \"unknown\"") @@ -127,8 +127,8 @@ func TestBuilderFactory(t *testing.T) { assert.Nil(t, b.Factory(component.MustNewID("bar").Type())) } -func createSettings(id component.ID) CreateSettings { - return CreateSettings{ +func createSettings(id component.ID) Settings { + return Settings{ ID: id, TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), diff --git a/extension/extensiontest/nop_extension.go b/extension/extensiontest/nop_extension.go index 134eee042a7..9378e6024bd 100644 --- a/extension/extensiontest/nop_extension.go +++ b/extension/extensiontest/nop_extension.go @@ -16,8 +16,15 @@ import ( var nopType = component.MustNewType("nop") // NewNopCreateSettings returns a new nop settings for extension.Factory Create* functions. -func NewNopCreateSettings() extension.CreateSettings { - return extension.CreateSettings{ +// +// Deprecated: [v0.103.0] Use extensiontest.NewNopSettings instead. +func NewNopCreateSettings() extension.Settings { + return NewNopSettings() +} + +// NewNopSettings returns a new nop settings for extension.Factory Create* functions. +func NewNopSettings() extension.Settings { + return extension.Settings{ ID: component.NewIDWithName(nopType, uuid.NewString()), TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), @@ -31,7 +38,7 @@ func NewNopFactory() extension.Factory { func() component.Config { return &nopConfig{} }, - func(context.Context, extension.CreateSettings, component.Config) (extension.Extension, error) { + func(context.Context, extension.Settings, component.Config) (extension.Extension, error) { return nopInstance, nil }, component.StabilityLevelStable) diff --git a/extension/extensiontest/nop_extension_test.go b/extension/extensiontest/nop_extension_test.go index 7ebda6195ae..6daa4331f47 100644 --- a/extension/extensiontest/nop_extension_test.go +++ b/extension/extensiontest/nop_extension_test.go @@ -21,7 +21,7 @@ func TestNewNopFactory(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &nopConfig{}, cfg) - traces, err := factory.CreateExtension(context.Background(), NewNopCreateSettings(), cfg) + traces, err := factory.CreateExtension(context.Background(), NewNopSettings(), cfg) require.NoError(t, err) assert.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost())) assert.NoError(t, traces.Shutdown(context.Background())) @@ -33,7 +33,7 @@ func TestNewNopBuilder(t *testing.T) { factory := NewNopFactory() cfg := factory.CreateDefaultConfig() - set := NewNopCreateSettings() + set := NewNopSettings() set.ID = component.NewID(nopType) ext, err := factory.CreateExtension(context.Background(), set, cfg) diff --git a/extension/extensiontest/statuswatcher_extension.go b/extension/extensiontest/statuswatcher_extension.go index eee0db94165..a4d78f9033e 100644 --- a/extension/extensiontest/statuswatcher_extension.go +++ b/extension/extensiontest/statuswatcher_extension.go @@ -12,8 +12,8 @@ import ( ) // NewStatusWatcherExtensionCreateSettings returns a new nop settings for Create*Extension functions. -func NewStatusWatcherExtensionCreateSettings() extension.CreateSettings { - return extension.CreateSettings{ +func NewStatusWatcherExtensionCreateSettings() extension.Settings { + return extension.Settings{ TelemetrySettings: componenttest.NewNopTelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo(), } @@ -28,7 +28,7 @@ func NewStatusWatcherExtensionFactory( func() component.Config { return &struct{}{} }, - func(context.Context, extension.CreateSettings, component.Config) (component.Component, error) { + func(context.Context, extension.Settings, component.Config) (component.Component, error) { return &statusWatcherExtension{onStatusChanged: onStatusChanged}, nil }, component.StabilityLevelStable) diff --git a/extension/memorylimiterextension/factory.go b/extension/memorylimiterextension/factory.go index 55b8efec5ea..b253e619483 100644 --- a/extension/memorylimiterextension/factory.go +++ b/extension/memorylimiterextension/factory.go @@ -28,6 +28,6 @@ func createDefaultConfig() component.Config { return &Config{} } -func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) { +func createExtension(_ context.Context, set extension.Settings, cfg component.Config) (extension.Extension, error) { return newMemoryLimiter(cfg.(*Config), set.TelemetrySettings.Logger) } diff --git a/extension/memorylimiterextension/factory_test.go b/extension/memorylimiterextension/factory_test.go index 21bae72ee6d..45bd06675aa 100644 --- a/extension/memorylimiterextension/factory_test.go +++ b/extension/memorylimiterextension/factory_test.go @@ -37,7 +37,7 @@ func TestCreateExtension(t *testing.T) { pCfg.MemorySpikeLimitMiB = 1907 pCfg.CheckInterval = 100 * time.Millisecond - tp, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + tp, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, tp) // test if we can shutdown a monitoring routine that has not started diff --git a/extension/memorylimiterextension/generated_component_test.go b/extension/memorylimiterextension/generated_component_test.go index b410b246b94..51b6002e0a8 100644 --- a/extension/memorylimiterextension/generated_component_test.go +++ b/extension/memorylimiterextension/generated_component_test.go @@ -31,12 +31,12 @@ func TestComponentLifecycle(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(&cfg)) t.Run("lifecycle", func(t *testing.T) { - firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, firstExt.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, firstExt.Shutdown(context.Background())) - secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondExt.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, secondExt.Shutdown(context.Background())) diff --git a/extension/zpagesextension/factory.go b/extension/zpagesextension/factory.go index ecb94cc0f97..dd6dda58645 100644 --- a/extension/zpagesextension/factory.go +++ b/extension/zpagesextension/factory.go @@ -30,6 +30,6 @@ func createDefaultConfig() component.Config { } // createExtension creates the extension based on this config. -func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) { +func createExtension(_ context.Context, set extension.Settings, cfg component.Config) (extension.Extension, error) { return newServer(cfg.(*Config), set.TelemetrySettings), nil } diff --git a/extension/zpagesextension/factory_test.go b/extension/zpagesextension/factory_test.go index fc1bcc512a1..ba36df32175 100644 --- a/extension/zpagesextension/factory_test.go +++ b/extension/zpagesextension/factory_test.go @@ -26,7 +26,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) - ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } @@ -35,7 +35,7 @@ func TestFactory_CreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.TCPAddr.Endpoint = testutil.GetAvailableLocalAddress(t) - ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } diff --git a/extension/zpagesextension/generated_component_test.go b/extension/zpagesextension/generated_component_test.go index 8caba7a6d95..fba4d348c4b 100644 --- a/extension/zpagesextension/generated_component_test.go +++ b/extension/zpagesextension/generated_component_test.go @@ -31,18 +31,18 @@ func TestComponentLifecycle(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(&cfg)) t.Run("shutdown", func(t *testing.T) { - e, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + e, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) err = e.Shutdown(context.Background()) require.NoError(t, err) }) t.Run("lifecycle", func(t *testing.T) { - firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, firstExt.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, firstExt.Shutdown(context.Background())) - secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) require.NoError(t, secondExt.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, secondExt.Shutdown(context.Background())) diff --git a/service/extensions/extensions.go b/service/extensions/extensions.go index e05c5aa01f0..c8f632965ca 100644 --- a/service/extensions/extensions.go +++ b/service/extensions/extensions.go @@ -183,7 +183,7 @@ func New(ctx context.Context, set Settings, cfg Config) (*Extensions, error) { ID: extID, Kind: component.KindExtension, } - extSet := extension.CreateSettings{ + extSet := extension.Settings{ ID: extID, TelemetrySettings: set.Telemetry.ToComponentTelemetrySettings(instanceID), BuildInfo: set.BuildInfo, diff --git a/service/extensions/extensions_test.go b/service/extensions/extensions_test.go index d447582bd54..d519132d3f3 100644 --- a/service/extensions/extensions_test.go +++ b/service/extensions/extensions_test.go @@ -158,10 +158,10 @@ func (tc testOrderCase) testOrdering(t *testing.T) { var startOrder []string var shutdownOrder []string - recordingExtensionFactory := newRecordingExtensionFactory(func(set extension.CreateSettings, _ component.Host) error { + recordingExtensionFactory := newRecordingExtensionFactory(func(set extension.Settings, _ component.Host) error { startOrder = append(startOrder, set.ID.String()) return nil - }, func(set extension.CreateSettings) error { + }, func(set extension.Settings) error { shutdownOrder = append(shutdownOrder, set.ID.String()) return nil }) @@ -326,7 +326,7 @@ func newConfigWatcherExtensionFactory(name component.Type, fn func() error) exte func() component.Config { return &struct{}{} }, - func(context.Context, extension.CreateSettings, component.Config) (extension.Extension, error) { + func(context.Context, extension.Settings, component.Config) (extension.Extension, error) { return newConfigWatcherExtension(fn), nil }, component.StabilityLevelDevelopment, @@ -339,7 +339,7 @@ func newBadExtensionFactory() extension.Factory { func() component.Config { return &struct{}{} }, - func(context.Context, extension.CreateSettings, component.Config) (extension.Extension, error) { + func(context.Context, extension.Settings, component.Config) (extension.Extension, error) { return nil, nil }, component.StabilityLevelDevelopment, @@ -352,7 +352,7 @@ func newCreateErrorExtensionFactory() extension.Factory { func() component.Config { return &struct{}{} }, - func(context.Context, extension.CreateSettings, component.Config) (extension.Extension, error) { + func(context.Context, extension.Settings, component.Config) (extension.Extension, error) { return nil, errors.New("cannot create \"err\" extension type") }, component.StabilityLevelDevelopment, @@ -476,20 +476,20 @@ func newStatusTestExtensionFactory(name component.Type, startErr, shutdownErr er func() component.Config { return &struct{}{} }, - func(context.Context, extension.CreateSettings, component.Config) (extension.Extension, error) { + func(context.Context, extension.Settings, component.Config) (extension.Extension, error) { return newStatusTestExtension(startErr, shutdownErr), nil }, component.StabilityLevelDevelopment, ) } -func newRecordingExtensionFactory(startCallback func(set extension.CreateSettings, host component.Host) error, shutdownCallback func(set extension.CreateSettings) error) extension.Factory { +func newRecordingExtensionFactory(startCallback func(set extension.Settings, host component.Host) error, shutdownCallback func(set extension.Settings) error) extension.Factory { return extension.NewFactory( component.MustNewType("recording"), func() component.Config { return &recordingExtensionConfig{} }, - func(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) { + func(_ context.Context, set extension.Settings, cfg component.Config) (extension.Extension, error) { return &recordingExtension{ config: cfg.(recordingExtensionConfig), createSettings: set, @@ -507,9 +507,9 @@ type recordingExtensionConfig struct { type recordingExtension struct { config recordingExtensionConfig - startCallback func(set extension.CreateSettings, host component.Host) error - shutdownCallback func(set extension.CreateSettings) error - createSettings extension.CreateSettings + startCallback func(set extension.Settings, host component.Host) error + shutdownCallback func(set extension.Settings) error + createSettings extension.Settings } var _ extension.Dependent = (*recordingExtension)(nil) diff --git a/service/service_test.go b/service/service_test.go index f8c0ad4dc4f..f708a82fb0d 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -599,7 +599,7 @@ func newConfigWatcherExtensionFactory(name component.Type) extension.Factory { func() component.Config { return &struct{}{} }, - func(context.Context, extension.CreateSettings, component.Config) (extension.Extension, error) { + func(context.Context, extension.Settings, component.Config) (extension.Extension, error) { return &configWatcherExtension{}, nil }, component.StabilityLevelDevelopment, From 6888f8f7a45fd6dff4dfc29a82802c95459f619c Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:44:09 -0700 Subject: [PATCH 048/168] [chore] removing unused loggers (#10354) These were declared and not used anywhere. Removing them. Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- exporter/exporterhelper/obsexporter.go | 3 --- processor/processorhelper/obsreport.go | 4 ---- receiver/receiverhelper/obsreport.go | 3 --- receiver/scraperhelper/obsreport.go | 4 ---- 4 files changed, 14 deletions(-) diff --git a/exporter/exporterhelper/obsexporter.go b/exporter/exporterhelper/obsexporter.go index f71971cef1d..0730c394667 100644 --- a/exporter/exporterhelper/obsexporter.go +++ b/exporter/exporterhelper/obsexporter.go @@ -10,7 +10,6 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - "go.uber.org/zap" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtelemetry" @@ -24,7 +23,6 @@ type ObsReport struct { level configtelemetry.Level spanNamePrefix string tracer trace.Tracer - logger *zap.Logger otelAttrs []attribute.KeyValue telemetryBuilder *metadata.TelemetryBuilder @@ -51,7 +49,6 @@ func newExporter(cfg ObsReportSettings) (*ObsReport, error) { level: cfg.ExporterCreateSettings.TelemetrySettings.MetricsLevel, spanNamePrefix: obsmetrics.ExporterPrefix + cfg.ExporterID.String(), tracer: cfg.ExporterCreateSettings.TracerProvider.Tracer(cfg.ExporterID.String()), - logger: cfg.ExporterCreateSettings.Logger, otelAttrs: []attribute.KeyValue{ attribute.String(obsmetrics.ExporterKey, cfg.ExporterID.String()), diff --git a/processor/processorhelper/obsreport.go b/processor/processorhelper/obsreport.go index d4d2730f53a..ad46303da6b 100644 --- a/processor/processorhelper/obsreport.go +++ b/processor/processorhelper/obsreport.go @@ -9,7 +9,6 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "go.uber.org/zap" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics" @@ -33,8 +32,6 @@ func BuildCustomMetricName(configType, metric string) string { // ObsReport is a helper to add observability to a processor. type ObsReport struct { - logger *zap.Logger - otelAttrs []attribute.KeyValue telemetryBuilder *metadata.TelemetryBuilder } @@ -56,7 +53,6 @@ func newObsReport(cfg ObsReportSettings) (*ObsReport, error) { return nil, err } return &ObsReport{ - logger: cfg.ProcessorCreateSettings.Logger, otelAttrs: []attribute.KeyValue{ attribute.String(obsmetrics.ProcessorKey, cfg.ProcessorID.String()), }, diff --git a/receiver/receiverhelper/obsreport.go b/receiver/receiverhelper/obsreport.go index e5d6fd9b0b7..f3904061329 100644 --- a/receiver/receiverhelper/obsreport.go +++ b/receiver/receiverhelper/obsreport.go @@ -12,7 +12,6 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - "go.uber.org/zap" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtelemetry" @@ -28,7 +27,6 @@ type ObsReport struct { transport string longLivedCtx bool tracer trace.Tracer - logger *zap.Logger otelAttrs []attribute.KeyValue telemetryBuilder *metadata.TelemetryBuilder @@ -63,7 +61,6 @@ func newReceiver(cfg ObsReportSettings) (*ObsReport, error) { transport: cfg.Transport, longLivedCtx: cfg.LongLivedCtx, tracer: cfg.ReceiverCreateSettings.TracerProvider.Tracer(cfg.ReceiverID.String()), - logger: cfg.ReceiverCreateSettings.Logger, otelAttrs: []attribute.KeyValue{ attribute.String(obsmetrics.ReceiverKey, cfg.ReceiverID.String()), diff --git a/receiver/scraperhelper/obsreport.go b/receiver/scraperhelper/obsreport.go index c7cb1b1dbeb..1ffe87f77fe 100644 --- a/receiver/scraperhelper/obsreport.go +++ b/receiver/scraperhelper/obsreport.go @@ -11,7 +11,6 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - "go.uber.org/zap" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtelemetry" @@ -28,8 +27,6 @@ type ObsReport struct { scraper component.ID tracer trace.Tracer - logger *zap.Logger - otelAttrs []attribute.KeyValue telemetryBuilder *metadata.TelemetryBuilder } @@ -57,7 +54,6 @@ func newScraper(cfg ObsReportSettings) (*ObsReport, error) { scraper: cfg.Scraper, tracer: cfg.ReceiverCreateSettings.TracerProvider.Tracer(cfg.Scraper.String()), - logger: cfg.ReceiverCreateSettings.Logger, otelAttrs: []attribute.KeyValue{ attribute.String(obsmetrics.ReceiverKey, cfg.ReceiverID.String()), attribute.String(obsmetrics.ScraperKey, cfg.Scraper.String()), From a6ace5321b92270b0b66ba29e38079cb1413088e Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:39:37 -0700 Subject: [PATCH 049/168] [chore] move opaque confmap test (#10358) This removes the dependency on confmap for tests in configopaque --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- config/configopaque/go.mod | 11 ----------- config/configopaque/go.sum | 16 ---------------- config/configopaque/opaque_test.go | 9 --------- config/configtls/go.mod | 2 -- config/configtls/go.sum | 16 ---------------- internal/e2e/go.mod | 4 ++-- internal/e2e/opaque_test.go | 30 ++++++++++++++++++++++++++++++ 7 files changed, 32 insertions(+), 56 deletions(-) create mode 100644 internal/e2e/opaque_test.go diff --git a/config/configopaque/go.mod b/config/configopaque/go.mod index c630c49e211..599192dabf5 100644 --- a/config/configopaque/go.mod +++ b/config/configopaque/go.mod @@ -4,25 +4,14 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.1 go.uber.org/goleak v1.3.0 gopkg.in/yaml.v3 v3.0.1 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect - 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.1.1 // indirect github.com/kr/pretty v0.3.1 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect - go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.27.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect ) - -replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/config/configopaque/go.sum b/config/configopaque/go.sum index c42b46e7c12..bdd6d70ba4d 100644 --- a/config/configopaque/go.sum +++ b/config/configopaque/go.sum @@ -1,14 +1,6 @@ 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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= -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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= -github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= -github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= -github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -16,10 +8,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= -github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -30,10 +18,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/config/configopaque/opaque_test.go b/config/configopaque/opaque_test.go index 820ae995593..044a5ea841c 100644 --- a/config/configopaque/opaque_test.go +++ b/config/configopaque/opaque_test.go @@ -11,8 +11,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - "go.opentelemetry.io/collector/confmap" ) var _ encoding.TextMarshaler = String("") @@ -48,13 +46,6 @@ func TestStringJSON(t *testing.T) { assert.Equal(t, `{"opaque":"[REDACTED]","plain":"plain"}`, string(bytes)) } -func TestConfMapMarshalConfigOpaque(t *testing.T) { - conf := confmap.New() - assert.NoError(t, conf.Marshal(example)) - assert.Equal(t, "[REDACTED]", conf.Get("opaque")) - assert.Equal(t, "plain", conf.Get("plain")) -} - func TestStringFmt(t *testing.T) { examples := []String{"opaque", "s", "veryveryveryveryveryveryveryveryveryverylong"} verbs := []string{"%s", "%q", "%v", "%#v", "%+v", "%x"} diff --git a/config/configtls/go.mod b/config/configtls/go.mod index ef6def16a96..b11afa8550a 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -17,5 +17,3 @@ require ( ) replace go.opentelemetry.io/collector/config/configopaque => ../configopaque - -replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/config/configtls/go.sum b/config/configtls/go.sum index a9394e0eca4..43a18279d5d 100644 --- a/config/configtls/go.sum +++ b/config/configtls/go.sum @@ -3,22 +3,10 @@ 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/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= -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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= -github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= -github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= -github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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/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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -27,10 +15,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 81792bb439b..ae78f5fb268 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -8,8 +8,10 @@ require ( go.opentelemetry.io/collector/component v0.102.1 go.opentelemetry.io/collector/config/configgrpc v0.102.1 go.opentelemetry.io/collector/config/confighttp v0.102.1 + go.opentelemetry.io/collector/config/configopaque v1.9.0 go.opentelemetry.io/collector/config/configretry v0.102.1 go.opentelemetry.io/collector/config/configtls v0.102.1 + go.opentelemetry.io/collector/confmap v0.102.1 go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/exporter v0.102.1 go.opentelemetry.io/collector/exporter/otlpexporter v0.102.0 @@ -55,10 +57,8 @@ require ( go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect go.opentelemetry.io/collector/config/confignet v0.102.1 // indirect - go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/collector/config/internal v0.102.1 // indirect - go.opentelemetry.io/collector/confmap v0.102.1 // indirect go.opentelemetry.io/collector/extension v0.102.1 // indirect go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect go.opentelemetry.io/collector/featuregate v1.9.0 // indirect diff --git a/internal/e2e/opaque_test.go b/internal/e2e/opaque_test.go new file mode 100644 index 00000000000..550df79b17c --- /dev/null +++ b/internal/e2e/opaque_test.go @@ -0,0 +1,30 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package e2e + +import ( + "testing" + + "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/collector/config/configopaque" + "go.opentelemetry.io/collector/confmap" +) + +type TestStruct struct { + Opaque configopaque.String `json:"opaque" yaml:"opaque"` + Plain string `json:"plain" yaml:"plain"` +} + +var example = TestStruct{ + Opaque: "opaque", + Plain: "plain", +} + +func TestConfMapMarshalConfigOpaque(t *testing.T) { + conf := confmap.New() + assert.NoError(t, conf.Marshal(example)) + assert.Equal(t, "[REDACTED]", conf.Get("opaque")) + assert.Equal(t, "plain", conf.Get("plain")) +} From 0d6e6bf8643cf7b88b37aa84aa62b2b3fbd44e51 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 6 Jun 2024 19:34:55 -0700 Subject: [PATCH 050/168] [filter] unexport CombinedFilter (#10348) #### Description Unexport CombinedFilter, it should not be exported as it implements Filter. --- .chloggen/filter.yaml | 25 +++++++++++++++++++++++++ filter/config.go | 13 ++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 .chloggen/filter.yaml diff --git a/.chloggen/filter.yaml b/.chloggen/filter.yaml new file mode 100644 index 00000000000..4006aa43af1 --- /dev/null +++ b/.chloggen/filter.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: filter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate the `filter.CombinedFilter` struct + +# One or more tracking issues or pull requests related to the change +issues: [10348] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/filter/config.go b/filter/config.go index e5b12c4f014..0fc63c86825 100644 --- a/filter/config.go +++ b/filter/config.go @@ -8,7 +8,7 @@ import ( "regexp" ) -// Config configures the matching behavior of a FilterSet. +// Config configures the matching behavior of a Filter. type Config struct { Strict string `mapstructure:"strict"` Regex string `mapstructure:"regexp"` @@ -32,14 +32,17 @@ func (c Config) Validate() error { return nil } -type CombinedFilter struct { +type combinedFilter struct { stricts map[any]struct{} regexes []*regexp.Regexp } -// CreateFilter creates a Filter from yaml config. +// Deprecated: [v0.103.0] This type will be removed in the future. +type CombinedFilter combinedFilter + +// CreateFilter creates a Filter out of a set of Config configuration objects. func CreateFilter(configs []Config) Filter { - cf := &CombinedFilter{ + cf := &combinedFilter{ stricts: make(map[any]struct{}), } for _, config := range configs { @@ -56,7 +59,7 @@ func CreateFilter(configs []Config) Filter { return cf } -func (cf *CombinedFilter) Matches(toMatch any) bool { +func (cf *combinedFilter) Matches(toMatch any) bool { _, ok := cf.stricts[toMatch] if ok { return ok From 6a78f1a25fd2d6ccdac1669a4fccd125acac7ba6 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Mon, 10 Jun 2024 07:44:19 -0700 Subject: [PATCH 051/168] [mdatagen] add support for optional internal metrics (#10316) This allows metrics to be initialized at a later time as is the case for the queue metrics in exporterhelper which are only initialized if a queue is configured. --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../codeboten_optional-internal-metric.yaml | 25 ++++++++++ .../internal/samplereceiver/documentation.md | 10 ++++ .../internal/samplereceiver/factory.go | 7 ++- .../internal/metadata/generated_telemetry.go | 16 +++++++ .../internal/samplereceiver/metadata.yaml | 9 ++++ .../internal/samplereceiver/metrics_test.go | 48 ++++++++++++++++++- cmd/mdatagen/loader.go | 4 ++ cmd/mdatagen/loader_test.go | 13 +++++ cmd/mdatagen/metadata-schema.yaml | 3 ++ cmd/mdatagen/templates/telemetry.go.tmpl | 27 ++++++++++- 10 files changed, 159 insertions(+), 3 deletions(-) create mode 100644 .chloggen/codeboten_optional-internal-metric.yaml diff --git a/.chloggen/codeboten_optional-internal-metric.yaml b/.chloggen/codeboten_optional-internal-metric.yaml new file mode 100644 index 00000000000..ed776cd9519 --- /dev/null +++ b/.chloggen/codeboten_optional-internal-metric.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: mdatagen + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add support for optional internal metrics + +# One or more tracking issues or pull requests related to the change +issues: [10316] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/mdatagen/internal/samplereceiver/documentation.md b/cmd/mdatagen/internal/samplereceiver/documentation.md index bfd994dd1b5..696344bb1cc 100644 --- a/cmd/mdatagen/internal/samplereceiver/documentation.md +++ b/cmd/mdatagen/internal/samplereceiver/documentation.md @@ -133,6 +133,16 @@ Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalA | ---- | ----------- | ---------- | --------- | | By | Sum | Int | true | +### queue_length + +This metric is optional and therefore not initialized in NewTelemetryBuilder. + +For example this metric only exists if feature A is enabled. + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| 1 | Gauge | Int | + ### request_duration Duration of request diff --git a/cmd/mdatagen/internal/samplereceiver/factory.go b/cmd/mdatagen/internal/samplereceiver/factory.go index f4e425c4c5e..7a3c9bb170d 100644 --- a/cmd/mdatagen/internal/samplereceiver/factory.go +++ b/cmd/mdatagen/internal/samplereceiver/factory.go @@ -32,7 +32,7 @@ func createMetrics(ctx context.Context, set receiver.Settings, _ component.Confi return nil, err } telemetryBuilder.BatchSizeTriggerSend.Add(ctx, 1) - return nopInstance, nil + return nopReceiver{telemetryBuilder: telemetryBuilder}, nil } func createLogs(context.Context, receiver.Settings, component.Config, consumer.Logs) (receiver.Logs, error) { @@ -44,4 +44,9 @@ var nopInstance = &nopReceiver{} type nopReceiver struct { component.StartFunc component.ShutdownFunc + telemetryBuilder *metadata.TelemetryBuilder +} + +func (r nopReceiver) initOptionalMetric() { + _ = r.telemetryBuilder.InitQueueLength(func() int64 { return 1 }) } diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go index 8b34cf0c164..f56e18ba5dc 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go @@ -30,6 +30,7 @@ type TelemetryBuilder struct { BatchSizeTriggerSend metric.Int64Counter ProcessRuntimeTotalAllocBytes metric.Int64ObservableCounter observeProcessRuntimeTotalAllocBytes func() int64 + QueueLength metric.Int64ObservableGauge RequestDuration metric.Float64Histogram level configtelemetry.Level attributeSet attribute.Set @@ -59,6 +60,21 @@ func WithProcessRuntimeTotalAllocBytesCallback(cb func() int64) telemetryBuilder } } +// InitQueueLength configures the QueueLength metric. +func (builder *TelemetryBuilder) InitQueueLength(cb func() int64) error { + var err error + builder.QueueLength, err = builder.meter.Int64ObservableGauge( + "queue_length", + metric.WithDescription("This metric is optional and therefore not initialized in NewTelemetryBuilder."), + metric.WithUnit("1"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(cb(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + ) + return err +} + // NewTelemetryBuilder provides a struct with methods to update all internal telemetry // for a component func NewTelemetryBuilder(settings component.TelemetrySettings, options ...telemetryBuilderOption) (*TelemetryBuilder, error) { diff --git a/cmd/mdatagen/internal/samplereceiver/metadata.yaml b/cmd/mdatagen/internal/samplereceiver/metadata.yaml index 03955d62c0a..1ccfa58b2b4 100644 --- a/cmd/mdatagen/internal/samplereceiver/metadata.yaml +++ b/cmd/mdatagen/internal/samplereceiver/metadata.yaml @@ -174,3 +174,12 @@ telemetry: async: true value_type: int monotonic: true + queue_length: + enabled: true + description: This metric is optional and therefore not initialized in NewTelemetryBuilder. + extended_documentation: For example this metric only exists if feature A is enabled. + unit: 1 + optional: true + gauge: + async: true + value_type: int diff --git a/cmd/mdatagen/internal/samplereceiver/metrics_test.go b/cmd/mdatagen/internal/samplereceiver/metrics_test.go index 3055b1dea31..de8146c12db 100644 --- a/cmd/mdatagen/internal/samplereceiver/metrics_test.go +++ b/cmd/mdatagen/internal/samplereceiver/metrics_test.go @@ -26,7 +26,7 @@ func TestGeneratedMetrics(t *testing.T) { func TestComponentTelemetry(t *testing.T) { tt := setupTestTelemetry() factory := NewFactory() - _, err := factory.CreateMetricsReceiver(context.Background(), tt.NewSettings(), componenttest.NewNopHost(), new(consumertest.MetricsSink)) + receiver, err := factory.CreateMetricsReceiver(context.Background(), tt.NewSettings(), componenttest.NewNopHost(), new(consumertest.MetricsSink)) require.NoError(t, err) tt.assertMetrics(t, []metricdata.Metrics{ { @@ -58,5 +58,51 @@ func TestComponentTelemetry(t *testing.T) { }, }, }) + rcv, ok := receiver.(nopReceiver) + require.True(t, ok) + rcv.initOptionalMetric() + tt.assertMetrics(t, []metricdata.Metrics{ + { + Name: "batch_size_trigger_send", + Description: "Number of times the batch was sent due to a size trigger", + Unit: "1", + Data: metricdata.Sum[int64]{ + Temporality: metricdata.CumulativeTemporality, + IsMonotonic: true, + DataPoints: []metricdata.DataPoint[int64]{ + { + Value: 1, + }, + }, + }, + }, + { + Name: "process_runtime_total_alloc_bytes", + Description: "Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')", + Unit: "By", + Data: metricdata.Sum[int64]{ + Temporality: metricdata.CumulativeTemporality, + IsMonotonic: true, + DataPoints: []metricdata.DataPoint[int64]{ + { + Value: 2, + }, + }, + }, + }, + { + Name: "queue_length", + Description: "This metric is optional and therefore not initialized in NewTelemetryBuilder.", + Unit: "1", + Data: metricdata.Gauge[int64]{ + DataPoints: []metricdata.DataPoint[int64]{ + { + Value: 1, + }, + }, + }, + }, + }) require.NoError(t, tt.Shutdown(context.Background())) + } diff --git a/cmd/mdatagen/loader.go b/cmd/mdatagen/loader.go index a2f1de68419..70a316981c7 100644 --- a/cmd/mdatagen/loader.go +++ b/cmd/mdatagen/loader.go @@ -111,6 +111,10 @@ type metric struct { // be appended to the description used in generated documentation. ExtendedDocumentation string `mapstructure:"extended_documentation"` + // Optional can be used to specify metrics that may + // or may not be present in all cases, depending on configuration. + Optional bool `mapstructure:"optional"` + // Unit of the metric. Unit *string `mapstructure:"unit"` diff --git a/cmd/mdatagen/loader_test.go b/cmd/mdatagen/loader_test.go index bdd8ffeeb37..de7fdc4d37a 100644 --- a/cmd/mdatagen/loader_test.go +++ b/cmd/mdatagen/loader_test.go @@ -263,6 +263,19 @@ func TestLoadMetadata(t *testing.T) { Async: true, }, }, + "queue_length": { + Enabled: true, + Description: "This metric is optional and therefore not initialized in NewTelemetryBuilder.", + ExtendedDocumentation: "For example this metric only exists if feature A is enabled.", + Unit: strPtr("1"), + Optional: true, + Gauge: &gauge{ + MetricValueType: MetricValueType{ + ValueType: pmetric.NumberDataPointValueTypeInt, + }, + Async: true, + }, + }, }, }, ScopeName: "go.opentelemetry.io/collector/internal/receiver/samplereceiver", diff --git a/cmd/mdatagen/metadata-schema.yaml b/cmd/mdatagen/metadata-schema.yaml index 24b5d038d00..999397a45c6 100644 --- a/cmd/mdatagen/metadata-schema.yaml +++ b/cmd/mdatagen/metadata-schema.yaml @@ -140,6 +140,9 @@ telemetry: description: # Optional: extended documentation of the metric. extended_documentation: + # Optional: whether or not this metric is optional. Optional metrics may only be initialized + # if certain features are enabled or configured. + optional: bool # Optional: warnings that will be shown to user under specified conditions. warnings: # A warning that will be displayed if the metric is enabled in user config. diff --git a/cmd/mdatagen/templates/telemetry.go.tmpl b/cmd/mdatagen/templates/telemetry.go.tmpl index 21ed853be04..992df6bf328 100644 --- a/cmd/mdatagen/templates/telemetry.go.tmpl +++ b/cmd/mdatagen/templates/telemetry.go.tmpl @@ -32,7 +32,7 @@ type TelemetryBuilder struct { meter metric.Meter {{- range $name, $metric := .Telemetry.Metrics }} {{ $name.Render }} metric.{{ $metric.Data.Instrument }} - {{- if $metric.Data.Async }} + {{- if and ($metric.Data.Async) (not $metric.Optional) }} observe{{ $name.Render }} func() {{ $metric.Data.BasicType }} {{- end }} {{- end }} @@ -60,6 +60,28 @@ func WithAttributeSet(set attribute.Set) telemetryBuilderOption { {{- end }} {{- range $name, $metric := .Telemetry.Metrics }} + {{- if $metric.Optional }} +// Init{{ $name.Render }} configures the {{ $name.Render }} metric. +func (builder *TelemetryBuilder) Init{{ $name.Render }}({{ if $metric.Data.Async -}}cb func() {{ $metric.Data.BasicType }}{{- end }}) error { + var err error + builder.{{ $name.Render }}, err = builder.meter.{{ $metric.Data.Instrument }}( + "{{ $name }}", + metric.WithDescription("{{ $metric.Description }}"), + metric.WithUnit("{{ $metric.Unit }}"), + {{- if eq $metric.Data.Type "Histogram" -}} + {{ if $metric.Data.Boundaries -}}metric.WithExplicitBucketBoundaries([]float64{ {{- range $metric.Data.Boundaries }} {{.}}, {{- end }} }...),{{- end }} + {{- end }} + {{ if $metric.Data.Async -}} + metric.With{{ casesTitle $metric.Data.BasicType }}Callback(func(_ context.Context, o metric.{{ casesTitle $metric.Data.BasicType }}Observer) error { + o.Observe(cb(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + {{- end }} + ) + return err +} + + {{- else }} {{ if $metric.Data.Async -}} // With{{ $name.Render }}Callback sets callback for observable {{ $name.Render }} metric. func With{{ $name.Render }}Callback(cb func() {{ $metric.Data.BasicType }}) telemetryBuilderOption { @@ -68,6 +90,7 @@ func With{{ $name.Render }}Callback(cb func() {{ $metric.Data.BasicType }}) tele } } {{- end }} + {{- end }} {{- end }} @@ -86,6 +109,7 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme } {{- range $name, $metric := .Telemetry.Metrics }} + {{- if not $metric.Optional }} builder.{{ $name.Render }}, err = builder.meter.{{ $metric.Data.Instrument }}( "{{ $name }}", metric.WithDescription("{{ $metric.Description }}"), @@ -102,6 +126,7 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme ) errs = errors.Join(errs, err) {{- end }} + {{- end }} return &builder, errs } From a2289fd9105bf0cc6a20820a7f262b1a475957ed Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Mon, 10 Jun 2024 09:04:29 -0700 Subject: [PATCH 052/168] [service] use mdatagen for service metrics (#10273) This reverts the reverts https://github.com/open-telemetry/opentelemetry-collector/pull/10271 and adds a mechanism to skip adding a create settings method for the service package component test. Will need to figure out if servicetelemetry.TelemetrySettings should be renamed to fit w/ the other CreateSettings structs before removing this check. Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../component_telemetry_test.go.tmpl | 5 + service/documentation.md | 55 ++++++ service/generated_component_telemetry_test.go | 64 +++++++ service/generated_package_test.go | 13 ++ .../internal/metadata/generated_telemetry.go | 179 ++++++++++++++++++ .../metadata/generated_telemetry_test.go | 76 ++++++++ .../proctelemetry/process_telemetry.go | 94 ++------- .../process_telemetry_linux_test.go | 2 +- .../proctelemetry/process_telemetry_test.go | 9 +- service/metadata.yaml | 68 +++++++ service/service.go | 4 +- 11 files changed, 481 insertions(+), 88 deletions(-) create mode 100644 service/documentation.md create mode 100644 service/generated_component_telemetry_test.go create mode 100644 service/generated_package_test.go create mode 100644 service/internal/metadata/generated_telemetry.go create mode 100644 service/internal/metadata/generated_telemetry_test.go create mode 100644 service/metadata.yaml diff --git a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl index 33372616141..c5989de15af 100644 --- a/cmd/mdatagen/templates/component_telemetry_test.go.tmpl +++ b/cmd/mdatagen/templates/component_telemetry_test.go.tmpl @@ -12,8 +12,10 @@ import ( sdkmetric "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/collector/component" + {{- if or isConnector isExporter isExtension isProcessor isReceiver }} "go.opentelemetry.io/collector/{{ .Status.Class }}" "go.opentelemetry.io/collector/{{ .Status.Class }}/{{ .Status.Class }}test" + {{- end }} ) type componentTestTelemetry struct { @@ -21,6 +23,7 @@ type componentTestTelemetry struct { meterProvider *sdkmetric.MeterProvider } +{{- if or isConnector isExporter isExtension isProcessor isReceiver }} func (tt *componentTestTelemetry) NewSettings() {{ .Status.Class }}.Settings { settings := {{ .Status.Class }}test.NewNopSettings() settings.MeterProvider = tt.meterProvider @@ -29,6 +32,8 @@ func (tt *componentTestTelemetry) NewSettings() {{ .Status.Class }}.Settings { return settings } +{{- end }} + func setupTestTelemetry() componentTestTelemetry { reader := sdkmetric.NewManualReader() return componentTestTelemetry{ diff --git a/service/documentation.md b/service/documentation.md new file mode 100644 index 00000000000..2cbd48a0708 --- /dev/null +++ b/service/documentation.md @@ -0,0 +1,55 @@ +[comment]: <> (Code generated by mdatagen. DO NOT EDIT.) + +# service + +## Internal Telemetry + +The following telemetry is emitted by this component. + +### process_cpu_seconds + +Total CPU user and system time in seconds + +| Unit | Metric Type | Value Type | Monotonic | +| ---- | ----------- | ---------- | --------- | +| s | Sum | Double | true | + +### process_memory_rss + +Total physical memory (resident set size) + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| By | Gauge | Int | + +### process_runtime_heap_alloc_bytes + +Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| By | Gauge | Int | + +### process_runtime_total_alloc_bytes + +Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') + +| Unit | Metric Type | Value Type | Monotonic | +| ---- | ----------- | ---------- | --------- | +| By | Sum | Int | true | + +### process_runtime_total_sys_memory_bytes + +Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| By | Gauge | Int | + +### process_uptime + +Uptime of the process + +| Unit | Metric Type | Value Type | Monotonic | +| ---- | ----------- | ---------- | --------- | +| s | Sum | Double | true | diff --git a/service/generated_component_telemetry_test.go b/service/generated_component_telemetry_test.go new file mode 100644 index 00000000000..49df62f1b8b --- /dev/null +++ b/service/generated_component_telemetry_test.go @@ -0,0 +1,64 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package service + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + sdkmetric "go.opentelemetry.io/otel/sdk/metric" + "go.opentelemetry.io/otel/sdk/metric/metricdata" + "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" +) + +type componentTestTelemetry struct { + reader *sdkmetric.ManualReader + meterProvider *sdkmetric.MeterProvider +} + +func setupTestTelemetry() componentTestTelemetry { + reader := sdkmetric.NewManualReader() + return componentTestTelemetry{ + reader: reader, + meterProvider: sdkmetric.NewMeterProvider(sdkmetric.WithReader(reader)), + } +} + +func (tt *componentTestTelemetry) assertMetrics(t *testing.T, expected []metricdata.Metrics) { + var md metricdata.ResourceMetrics + require.NoError(t, tt.reader.Collect(context.Background(), &md)) + // ensure all required metrics are present + for _, want := range expected { + got := tt.getMetric(want.Name, md) + metricdatatest.AssertEqual(t, want, got, metricdatatest.IgnoreTimestamp()) + } + + // ensure no additional metrics are emitted + require.Equal(t, len(expected), tt.len(md)) +} + +func (tt *componentTestTelemetry) getMetric(name string, got metricdata.ResourceMetrics) metricdata.Metrics { + for _, sm := range got.ScopeMetrics { + for _, m := range sm.Metrics { + if m.Name == name { + return m + } + } + } + + return metricdata.Metrics{} +} + +func (tt *componentTestTelemetry) len(got metricdata.ResourceMetrics) int { + metricsCount := 0 + for _, sm := range got.ScopeMetrics { + metricsCount += len(sm.Metrics) + } + + return metricsCount +} + +func (tt *componentTestTelemetry) Shutdown(ctx context.Context) error { + return tt.meterProvider.Shutdown(ctx) +} diff --git a/service/generated_package_test.go b/service/generated_package_test.go new file mode 100644 index 00000000000..545b6bb0c5e --- /dev/null +++ b/service/generated_package_test.go @@ -0,0 +1,13 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package service + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), goleak.IgnoreTopFunction("go.opentelemetry.io/collector/service/internal/proctelemetry.InitPrometheusServer.func1")) +} diff --git a/service/internal/metadata/generated_telemetry.go b/service/internal/metadata/generated_telemetry.go new file mode 100644 index 00000000000..dac0e287f35 --- /dev/null +++ b/service/internal/metadata/generated_telemetry.go @@ -0,0 +1,179 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "context" + "errors" + + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/metric/noop" + "go.opentelemetry.io/otel/trace" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configtelemetry" +) + +func Meter(settings component.TelemetrySettings) metric.Meter { + return settings.MeterProvider.Meter("go.opentelemetry.io/collector/service") +} + +func Tracer(settings component.TelemetrySettings) trace.Tracer { + return settings.TracerProvider.Tracer("go.opentelemetry.io/collector/service") +} + +// TelemetryBuilder provides an interface for components to report telemetry +// as defined in metadata and user config. +type TelemetryBuilder struct { + meter metric.Meter + ProcessCPUSeconds metric.Float64ObservableCounter + observeProcessCPUSeconds func() float64 + ProcessMemoryRss metric.Int64ObservableGauge + observeProcessMemoryRss func() int64 + ProcessRuntimeHeapAllocBytes metric.Int64ObservableGauge + observeProcessRuntimeHeapAllocBytes func() int64 + ProcessRuntimeTotalAllocBytes metric.Int64ObservableCounter + observeProcessRuntimeTotalAllocBytes func() int64 + ProcessRuntimeTotalSysMemoryBytes metric.Int64ObservableGauge + observeProcessRuntimeTotalSysMemoryBytes func() int64 + ProcessUptime metric.Float64ObservableCounter + observeProcessUptime func() float64 + level configtelemetry.Level + attributeSet attribute.Set +} + +// telemetryBuilderOption applies changes to default builder. +type telemetryBuilderOption func(*TelemetryBuilder) + +// WithLevel sets the current telemetry level for the component. +func WithLevel(lvl configtelemetry.Level) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.level = lvl + } +} + +// WithAttributeSet applies a set of attributes for asynchronous instruments. +func WithAttributeSet(set attribute.Set) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.attributeSet = set + } +} + +// WithProcessCPUSecondsCallback sets callback for observable ProcessCPUSeconds metric. +func WithProcessCPUSecondsCallback(cb func() float64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessCPUSeconds = cb + } +} + +// WithProcessMemoryRssCallback sets callback for observable ProcessMemoryRss metric. +func WithProcessMemoryRssCallback(cb func() int64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessMemoryRss = cb + } +} + +// WithProcessRuntimeHeapAllocBytesCallback sets callback for observable ProcessRuntimeHeapAllocBytes metric. +func WithProcessRuntimeHeapAllocBytesCallback(cb func() int64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessRuntimeHeapAllocBytes = cb + } +} + +// WithProcessRuntimeTotalAllocBytesCallback sets callback for observable ProcessRuntimeTotalAllocBytes metric. +func WithProcessRuntimeTotalAllocBytesCallback(cb func() int64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessRuntimeTotalAllocBytes = cb + } +} + +// WithProcessRuntimeTotalSysMemoryBytesCallback sets callback for observable ProcessRuntimeTotalSysMemoryBytes metric. +func WithProcessRuntimeTotalSysMemoryBytesCallback(cb func() int64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessRuntimeTotalSysMemoryBytes = cb + } +} + +// WithProcessUptimeCallback sets callback for observable ProcessUptime metric. +func WithProcessUptimeCallback(cb func() float64) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.observeProcessUptime = cb + } +} + +// NewTelemetryBuilder provides a struct with methods to update all internal telemetry +// for a component +func NewTelemetryBuilder(settings component.TelemetrySettings, options ...telemetryBuilderOption) (*TelemetryBuilder, error) { + builder := TelemetryBuilder{level: configtelemetry.LevelBasic} + for _, op := range options { + op(&builder) + } + var err, errs error + if builder.level >= configtelemetry.LevelBasic { + builder.meter = Meter(settings) + } else { + builder.meter = noop.Meter{} + } + builder.ProcessCPUSeconds, err = builder.meter.Float64ObservableCounter( + "process_cpu_seconds", + metric.WithDescription("Total CPU user and system time in seconds"), + metric.WithUnit("s"), + metric.WithFloat64Callback(func(_ context.Context, o metric.Float64Observer) error { + o.Observe(builder.observeProcessCPUSeconds(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessMemoryRss, err = builder.meter.Int64ObservableGauge( + "process_memory_rss", + metric.WithDescription("Total physical memory (resident set size)"), + metric.WithUnit("By"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(builder.observeProcessMemoryRss(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessRuntimeHeapAllocBytes, err = builder.meter.Int64ObservableGauge( + "process_runtime_heap_alloc_bytes", + metric.WithDescription("Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc')"), + metric.WithUnit("By"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(builder.observeProcessRuntimeHeapAllocBytes(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessRuntimeTotalAllocBytes, err = builder.meter.Int64ObservableCounter( + "process_runtime_total_alloc_bytes", + metric.WithDescription("Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')"), + metric.WithUnit("By"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(builder.observeProcessRuntimeTotalAllocBytes(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessRuntimeTotalSysMemoryBytes, err = builder.meter.Int64ObservableGauge( + "process_runtime_total_sys_memory_bytes", + metric.WithDescription("Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys')"), + metric.WithUnit("By"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(builder.observeProcessRuntimeTotalSysMemoryBytes(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + ) + errs = errors.Join(errs, err) + builder.ProcessUptime, err = builder.meter.Float64ObservableCounter( + "process_uptime", + metric.WithDescription("Uptime of the process"), + metric.WithUnit("s"), + metric.WithFloat64Callback(func(_ context.Context, o metric.Float64Observer) error { + o.Observe(builder.observeProcessUptime(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + ) + errs = errors.Join(errs, err) + return &builder, errs +} diff --git a/service/internal/metadata/generated_telemetry_test.go b/service/internal/metadata/generated_telemetry_test.go new file mode 100644 index 00000000000..5e225295ba3 --- /dev/null +++ b/service/internal/metadata/generated_telemetry_test.go @@ -0,0 +1,76 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel/metric" + embeddedmetric "go.opentelemetry.io/otel/metric/embedded" + noopmetric "go.opentelemetry.io/otel/metric/noop" + "go.opentelemetry.io/otel/trace" + embeddedtrace "go.opentelemetry.io/otel/trace/embedded" + nooptrace "go.opentelemetry.io/otel/trace/noop" + + "go.opentelemetry.io/collector/component" +) + +type mockMeter struct { + noopmetric.Meter + name string +} +type mockMeterProvider struct { + embeddedmetric.MeterProvider +} + +func (m mockMeterProvider) Meter(name string, opts ...metric.MeterOption) metric.Meter { + return mockMeter{name: name} +} + +type mockTracer struct { + nooptrace.Tracer + name string +} + +type mockTracerProvider struct { + embeddedtrace.TracerProvider +} + +func (m mockTracerProvider) Tracer(name string, opts ...trace.TracerOption) trace.Tracer { + return mockTracer{name: name} +} + +func TestProviders(t *testing.T) { + set := component.TelemetrySettings{ + MeterProvider: mockMeterProvider{}, + TracerProvider: mockTracerProvider{}, + } + + meter := Meter(set) + if m, ok := meter.(mockMeter); ok { + require.Equal(t, "go.opentelemetry.io/collector/service", m.name) + } else { + require.Fail(t, "returned Meter not mockMeter") + } + + tracer := Tracer(set) + if m, ok := tracer.(mockTracer); ok { + require.Equal(t, "go.opentelemetry.io/collector/service", m.name) + } else { + require.Fail(t, "returned Meter not mockTracer") + } +} + +func TestNewTelemetryBuilder(t *testing.T) { + set := component.TelemetrySettings{ + MeterProvider: mockMeterProvider{}, + TracerProvider: mockTracerProvider{}, + } + applied := false + _, err := NewTelemetryBuilder(set, func(b *TelemetryBuilder) { + applied = true + }) + require.NoError(t, err) + require.True(t, applied) +} diff --git a/service/internal/proctelemetry/process_telemetry.go b/service/internal/proctelemetry/process_telemetry.go index 991897f8b1b..9f8f0874e97 100644 --- a/service/internal/proctelemetry/process_telemetry.go +++ b/service/internal/proctelemetry/process_telemetry.go @@ -12,13 +12,10 @@ import ( "github.com/shirou/gopsutil/v3/common" "github.com/shirou/gopsutil/v3/process" - otelmetric "go.opentelemetry.io/otel/metric" - "go.uber.org/multierr" -) -const ( - scopeName = "go.opentelemetry.io/collector/service/process_telemetry" - processNameKey = "process_name" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/service/internal/metadata" + "go.opentelemetry.io/collector/service/internal/servicetelemetry" ) // processMetrics is a struct that contains views related to process metrics (cpu, mem, etc) @@ -28,13 +25,6 @@ type processMetrics struct { proc *process.Process context context.Context - otelProcessUptime otelmetric.Float64ObservableCounter - otelAllocMem otelmetric.Int64ObservableGauge - otelTotalAllocMem otelmetric.Int64ObservableCounter - otelSysMem otelmetric.Int64ObservableGauge - otelCPUSeconds otelmetric.Float64ObservableCounter - otelRSSMemory otelmetric.Int64ObservableGauge - // mu protects everything bellow. mu sync.Mutex lastMsRead time.Time @@ -64,7 +54,7 @@ func WithHostProc(hostProc string) RegisterOption { // RegisterProcessMetrics creates a new set of processMetrics (mem, cpu) that can be used to measure // basic information about this process. -func RegisterProcessMetrics(mp otelmetric.MeterProvider, ballastSizeBytes uint64, opts ...RegisterOption) error { +func RegisterProcessMetrics(cfg servicetelemetry.TelemetrySettings, ballastSizeBytes uint64, opts ...RegisterOption) error { set := registerOption{} for _, opt := range opts { opt.apply(&set) @@ -86,73 +76,15 @@ func RegisterProcessMetrics(mp otelmetric.MeterProvider, ballastSizeBytes uint64 return err } - return pm.record(mp.Meter(scopeName)) -} - -func (pm *processMetrics) record(meter otelmetric.Meter) error { - var errs, err error - - pm.otelProcessUptime, err = meter.Float64ObservableCounter( - "process_uptime", - otelmetric.WithDescription("Uptime of the process"), - otelmetric.WithUnit("s"), - otelmetric.WithFloat64Callback(func(_ context.Context, o otelmetric.Float64Observer) error { - o.Observe(pm.updateProcessUptime()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelAllocMem, err = meter.Int64ObservableGauge( - "process_runtime_heap_alloc_bytes", - otelmetric.WithDescription("Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc')"), - otelmetric.WithUnit("By"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(pm.updateAllocMem()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelTotalAllocMem, err = meter.Int64ObservableCounter( - "process_runtime_total_alloc_bytes", - otelmetric.WithDescription("Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')"), - otelmetric.WithUnit("By"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(pm.updateTotalAllocMem()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelSysMem, err = meter.Int64ObservableGauge( - "process_runtime_total_sys_memory_bytes", - otelmetric.WithDescription("Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys')"), - otelmetric.WithUnit("By"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(pm.updateSysMem()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelCPUSeconds, err = meter.Float64ObservableCounter( - "process_cpu_seconds", - otelmetric.WithDescription("Total CPU user and system time in seconds"), - otelmetric.WithUnit("s"), - otelmetric.WithFloat64Callback(func(_ context.Context, o otelmetric.Float64Observer) error { - o.Observe(pm.updateCPUSeconds()) - return nil - })) - errs = multierr.Append(errs, err) - - pm.otelRSSMemory, err = meter.Int64ObservableGauge( - "process_memory_rss", - otelmetric.WithDescription("Total physical memory (resident set size)"), - otelmetric.WithUnit("By"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(pm.updateRSSMemory()) - return nil - })) - errs = multierr.Append(errs, err) - - return errs + _, err = metadata.NewTelemetryBuilder(cfg.ToComponentTelemetrySettings(&component.InstanceID{}), + metadata.WithProcessUptimeCallback(pm.updateProcessUptime), + metadata.WithProcessRuntimeHeapAllocBytesCallback(pm.updateAllocMem), + metadata.WithProcessRuntimeTotalAllocBytesCallback(pm.updateTotalAllocMem), + metadata.WithProcessRuntimeTotalSysMemoryBytesCallback(pm.updateSysMem), + metadata.WithProcessCPUSecondsCallback(pm.updateCPUSeconds), + metadata.WithProcessMemoryRssCallback(pm.updateRSSMemory), + ) + return err } func (pm *processMetrics) updateProcessUptime() float64 { diff --git a/service/internal/proctelemetry/process_telemetry_linux_test.go b/service/internal/proctelemetry/process_telemetry_linux_test.go index 1a15f28fc7e..73605c0ae8e 100644 --- a/service/internal/proctelemetry/process_telemetry_linux_test.go +++ b/service/internal/proctelemetry/process_telemetry_linux_test.go @@ -21,7 +21,7 @@ func TestProcessTelemetryWithHostProc(t *testing.T) { // Make the sure the environment variable value is not used. t.Setenv("HOST_PROC", "foo/bar") - require.NoError(t, RegisterProcessMetrics(tel.MeterProvider, 0, WithHostProc("/proc"))) + require.NoError(t, RegisterProcessMetrics(tel.TelemetrySettings, 0, WithHostProc("/proc"))) // Check that the metrics are actually filled. time.Sleep(200 * time.Millisecond) diff --git a/service/internal/proctelemetry/process_telemetry_test.go b/service/internal/proctelemetry/process_telemetry_test.go index 40d0f54ef27..f1da8d6a34c 100644 --- a/service/internal/proctelemetry/process_telemetry_test.go +++ b/service/internal/proctelemetry/process_telemetry_test.go @@ -20,13 +20,12 @@ import ( sdkmetric "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/resource" - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtelemetry" + "go.opentelemetry.io/collector/service/internal/servicetelemetry" ) type testTelemetry struct { - component.TelemetrySettings + servicetelemetry.TelemetrySettings promHandler http.Handler meterProvider *sdkmetric.MeterProvider } @@ -42,7 +41,7 @@ var expectedMetrics = []string{ func setupTelemetry(t *testing.T) testTelemetry { settings := testTelemetry{ - TelemetrySettings: componenttest.NewNopTelemetrySettings(), + TelemetrySettings: servicetelemetry.NewNopTelemetrySettings(), } settings.TelemetrySettings.MetricsLevel = configtelemetry.LevelNormal @@ -79,7 +78,7 @@ func fetchPrometheusMetrics(handler http.Handler) (map[string]*io_prometheus_cli func TestProcessTelemetry(t *testing.T) { tel := setupTelemetry(t) - require.NoError(t, RegisterProcessMetrics(tel.MeterProvider, 0)) + require.NoError(t, RegisterProcessMetrics(tel.TelemetrySettings, 0)) mp, err := fetchPrometheusMetrics(tel.promHandler) require.NoError(t, err) diff --git a/service/metadata.yaml b/service/metadata.yaml new file mode 100644 index 00000000000..d5417740d57 --- /dev/null +++ b/service/metadata.yaml @@ -0,0 +1,68 @@ +type: service + +status: + class: pkg + stability: + development: [traces, metrics, logs] + distributions: [core, contrib] + +tests: + goleak: + ignore: + top: + # See https://github.com/census-instrumentation/opencensus-go/issues/1191 for more information. + - "go.opencensus.io/stats/view.(*worker).start" + - "go.opentelemetry.io/collector/service/internal/proctelemetry.InitPrometheusServer.func1" + +telemetry: + metrics: + process_uptime: + enabled: true + description: Uptime of the process + unit: s + sum: + async: true + value_type: double + monotonic: true + + process_runtime_heap_alloc_bytes: + enabled: true + description: Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') + unit: By + gauge: + async: true + value_type: int + + process_runtime_total_alloc_bytes: + enabled: true + description: Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') + unit: By + sum: + async: true + value_type: int + monotonic: true + + process_runtime_total_sys_memory_bytes: + enabled: true + description: Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') + unit: By + gauge: + async: true + value_type: int + + process_cpu_seconds: + enabled: true + description: Total CPU user and system time in seconds + unit: s + sum: + async: true + value_type: double + monotonic: true + + process_memory_rss: + enabled: true + description: Total physical memory (resident set size) + unit: By + gauge: + async: true + value_type: int diff --git a/service/service.go b/service/service.go index 53ea3eebe65..eb320cfec2c 100644 --- a/service/service.go +++ b/service/service.go @@ -1,6 +1,8 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 +//go:generate mdatagen metadata.yaml + package service // import "go.opentelemetry.io/collector/service" import ( @@ -289,7 +291,7 @@ func (srv *Service) initExtensionsAndPipeline(ctx context.Context, set Settings, if cfg.Telemetry.Metrics.Level != configtelemetry.LevelNone && cfg.Telemetry.Metrics.Address != "" { // The process telemetry initialization requires the ballast size, which is available after the extensions are initialized. - if err = proctelemetry.RegisterProcessMetrics(srv.telemetrySettings.MeterProvider, getBallastSize(srv.host)); err != nil { + if err = proctelemetry.RegisterProcessMetrics(srv.telemetrySettings, getBallastSize(srv.host)); err != nil { return fmt.Errorf("failed to register process metrics: %w", err) } } From effe26710d251afb58ce4efc5ae5aac52d9b61a0 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 10 Jun 2024 18:28:10 +0000 Subject: [PATCH 053/168] [chore] Promote @evan-bradley to approver role (#10373) Fixes #10371 :tada: cc @open-telemetry/collector-approvers --- README.md | 2 +- docs/release.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d991bb5075..8d30022a0f3 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,6 @@ Here is a list of community roles with current and previous members: - Triagers ([@open-telemetry/collector-triagers](https://github.com/orgs/open-telemetry/teams/collector-triagers)): - [Andrzej Stencel](https://github.com/andrzej-stencel), Elastic - - [Evan Bradley](https://github.com/evan-bradley), Dynatrace - Actively seeking contributors to triage issues - Emeritus Triagers: @@ -169,6 +168,7 @@ Here is a list of community roles with current and previous members: - [Antoine Toulme](https://github.com/atoulme), Splunk - [Daniel Jaglowski](https://github.com/djaglowski), observIQ + - [Evan Bradley](https://github.com/evan-bradley), Dynatrace - [Juraci Paixão Kröhling](https://github.com/jpkrohling), Grafana Labs - [Tyler Helmuth](https://github.com/TylerHelmuth), Honeycomb - [Yang Song](https://github.com/songy23), Datadog diff --git a/docs/release.md b/docs/release.md index 0207eefbdbb..a38338c506b 100644 --- a/docs/release.md +++ b/docs/release.md @@ -167,3 +167,4 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR | 2024-09-09 | v0.109.0 | @bogdandrutu | | 2024-09-23 | v0.110.0 | @jpkrohling | | 2024-10-07 | v0.111.0 | @mx-psi | +| 2024-10-21 | v0.112.0 | @evan-bradley | From be8ca393f8b3f3355fbb134a1c0c6bb3c5fb35cd Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:16:01 -0700 Subject: [PATCH 054/168] [chore] bump dep to address cve (#10379) Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- config/configgrpc/go.mod | 4 ++-- config/configgrpc/go.sum | 8 ++++---- exporter/otlpexporter/go.mod | 4 ++-- exporter/otlpexporter/go.sum | 8 ++++---- internal/e2e/go.mod | 2 +- internal/e2e/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 5da9dceec49..cef5391dfdf 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -64,7 +64,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mostynb/go-grpc-compression v1.2.2 // indirect + github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 67cc3c00a33..cfc2788e940 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -94,8 +94,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= -github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= +github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= +github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index a22e4b507ff..e194105907b 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -3,8 +3,8 @@ module go.opentelemetry.io/collector/config/configgrpc go 1.21.0 require ( - github.com/klauspost/compress v1.17.2 - github.com/mostynb/go-grpc-compression v1.2.2 + github.com/klauspost/compress v1.17.8 + github.com/mostynb/go-grpc-compression v1.2.3 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.102.1 go.opentelemetry.io/collector/component v0.102.1 diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index dc78c6d50d7..f3060f5c932 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -27,8 +27,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= @@ -48,8 +48,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= -github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= +github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= +github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index e60c40d1e3a..6d0446fb591 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -39,7 +39,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.8 // indirect 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.1.1 // indirect @@ -47,7 +47,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mostynb/go-grpc-compression v1.2.2 // indirect + github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 85dbdc1c6ab..4de11e76a7b 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -33,8 +33,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= @@ -54,8 +54,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= -github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= +github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= +github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index ae78f5fb268..f247b24ca2e 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -47,7 +47,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mostynb/go-grpc-compression v1.2.2 // indirect + github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 7546cf7fba9..74e784f557b 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -56,8 +56,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= -github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= +github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= +github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 3a2e0a11d83..fa6e6898f8d 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -46,7 +46,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mostynb/go-grpc-compression v1.2.2 // indirect + github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 7546cf7fba9..74e784f557b 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -56,8 +56,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= -github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= +github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= +github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= From 7704414027d82f2f8ae4034c4cab886d2df5cf66 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:25:57 -0700 Subject: [PATCH 055/168] [exporterhelper] move queue metrics to mdatagen (#10318) This uses mdatagen to generate the queue metrics. This will allow users to see the metric in the documentation for exporter helper --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- exporter/exporterhelper/common.go | 4 +- exporter/exporterhelper/documentation.md | 16 ++++++ .../internal/metadata/generated_telemetry.go | 42 +++++++++++++++ exporter/exporterhelper/metadata.yaml | 18 +++++++ exporter/exporterhelper/obsexporter.go | 4 +- exporter/exporterhelper/queue_sender.go | 52 ++++--------------- exporter/exporterhelper/queue_sender_test.go | 6 ++- 7 files changed, 96 insertions(+), 46 deletions(-) diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index e07a1a37189..4ed1dd3cb39 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -110,7 +110,7 @@ func WithQueue(config QueueSettings) Option { NumConsumers: config.NumConsumers, QueueSize: config.QueueSize, }) - o.queueSender = newQueueSender(q, o.set, config.NumConsumers, o.exportFailureMessage) + o.queueSender = newQueueSender(q, o.set, config.NumConsumers, o.exportFailureMessage, o.obsrep.telemetryBuilder) return nil } } @@ -132,7 +132,7 @@ func WithRequestQueue(cfg exporterqueue.Config, queueFactory exporterqueue.Facto DataType: o.signal, ExporterSettings: o.set, } - o.queueSender = newQueueSender(queueFactory(context.Background(), set, cfg), o.set, cfg.NumConsumers, o.exportFailureMessage) + o.queueSender = newQueueSender(queueFactory(context.Background(), set, cfg), o.set, cfg.NumConsumers, o.exportFailureMessage, o.obsrep.telemetryBuilder) return nil } } diff --git a/exporter/exporterhelper/documentation.md b/exporter/exporterhelper/documentation.md index ac974e01dd2..df11c1af81e 100644 --- a/exporter/exporterhelper/documentation.md +++ b/exporter/exporterhelper/documentation.md @@ -30,6 +30,22 @@ Number of spans failed to be added to the sending queue. | ---- | ----------- | ---------- | --------- | | 1 | Sum | Int | true | +### exporter_queue_capacity + +Fixed capacity of the retry queue (in batches) + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| 1 | Gauge | Int | + +### exporter_queue_size + +Current size of the retry queue (in batches) + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| 1 | Gauge | Int | + ### exporter_send_failed_log_records Number of log records in failed attempts to send to destination. diff --git a/exporter/exporterhelper/internal/metadata/generated_telemetry.go b/exporter/exporterhelper/internal/metadata/generated_telemetry.go index 076b84bf9a8..4383809885e 100644 --- a/exporter/exporterhelper/internal/metadata/generated_telemetry.go +++ b/exporter/exporterhelper/internal/metadata/generated_telemetry.go @@ -3,8 +3,10 @@ package metadata import ( + "context" "errors" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" @@ -28,6 +30,8 @@ type TelemetryBuilder struct { ExporterEnqueueFailedLogRecords metric.Int64Counter ExporterEnqueueFailedMetricPoints metric.Int64Counter ExporterEnqueueFailedSpans metric.Int64Counter + ExporterQueueCapacity metric.Int64ObservableGauge + ExporterQueueSize metric.Int64ObservableGauge ExporterSendFailedLogRecords metric.Int64Counter ExporterSendFailedMetricPoints metric.Int64Counter ExporterSendFailedSpans metric.Int64Counter @@ -35,6 +39,7 @@ type TelemetryBuilder struct { ExporterSentMetricPoints metric.Int64Counter ExporterSentSpans metric.Int64Counter level configtelemetry.Level + attributeSet attribute.Set } // telemetryBuilderOption applies changes to default builder. @@ -47,6 +52,43 @@ func WithLevel(lvl configtelemetry.Level) telemetryBuilderOption { } } +// WithAttributeSet applies a set of attributes for asynchronous instruments. +func WithAttributeSet(set attribute.Set) telemetryBuilderOption { + return func(builder *TelemetryBuilder) { + builder.attributeSet = set + } +} + +// InitExporterQueueCapacity configures the ExporterQueueCapacity metric. +func (builder *TelemetryBuilder) InitExporterQueueCapacity(cb func() int64) error { + var err error + builder.ExporterQueueCapacity, err = builder.meter.Int64ObservableGauge( + "exporter_queue_capacity", + metric.WithDescription("Fixed capacity of the retry queue (in batches)"), + metric.WithUnit("1"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(cb(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + ) + return err +} + +// InitExporterQueueSize configures the ExporterQueueSize metric. +func (builder *TelemetryBuilder) InitExporterQueueSize(cb func() int64) error { + var err error + builder.ExporterQueueSize, err = builder.meter.Int64ObservableGauge( + "exporter_queue_size", + metric.WithDescription("Current size of the retry queue (in batches)"), + metric.WithUnit("1"), + metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { + o.Observe(cb(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }), + ) + return err +} + // NewTelemetryBuilder provides a struct with methods to update all internal telemetry // for a component func NewTelemetryBuilder(settings component.TelemetrySettings, options ...telemetryBuilderOption) (*TelemetryBuilder, error) { diff --git a/exporter/exporterhelper/metadata.yaml b/exporter/exporterhelper/metadata.yaml index 26b06a37536..0703902f6f4 100644 --- a/exporter/exporterhelper/metadata.yaml +++ b/exporter/exporterhelper/metadata.yaml @@ -80,3 +80,21 @@ telemetry: sum: value_type: int monotonic: true + + exporter_queue_size: + enabled: true + description: Current size of the retry queue (in batches) + unit: 1 + optional: true + gauge: + value_type: int + async: true + + exporter_queue_capacity: + enabled: true + description: Fixed capacity of the retry queue (in batches) + unit: 1 + optional: true + gauge: + value_type: int + async: true diff --git a/exporter/exporterhelper/obsexporter.go b/exporter/exporterhelper/obsexporter.go index 0730c394667..8093bd1f834 100644 --- a/exporter/exporterhelper/obsexporter.go +++ b/exporter/exporterhelper/obsexporter.go @@ -40,7 +40,9 @@ func NewObsReport(cfg ObsReportSettings) (*ObsReport, error) { } func newExporter(cfg ObsReportSettings) (*ObsReport, error) { - telemetryBuilder, err := metadata.NewTelemetryBuilder(cfg.ExporterCreateSettings.TelemetrySettings) + telemetryBuilder, err := metadata.NewTelemetryBuilder(cfg.ExporterCreateSettings.TelemetrySettings, + metadata.WithAttributeSet(attribute.NewSet(attribute.String(obsmetrics.ExporterKey, cfg.ExporterID.String()))), + ) if err != nil { return nil, err } diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index 48dd0476572..dbbf71f7bc5 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -9,13 +9,13 @@ import ( "time" "go.opentelemetry.io/otel/attribute" - otelmetric "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" "go.uber.org/multierr" "go.uber.org/zap" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadata" "go.opentelemetry.io/collector/exporter/exporterqueue" "go.opentelemetry.io/collector/exporter/internal/queue" "go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics" @@ -23,10 +23,6 @@ import ( const defaultQueueSize = 1000 -var ( - scopeName = "go.opentelemetry.io/collector/exporterhelper" -) - // QueueSettings defines configuration for queueing batches before sending to the consumerSender. type QueueSettings struct { // Enabled indicates whether to not enqueue batches before sending to the consumerSender. @@ -73,27 +69,21 @@ func (qCfg *QueueSettings) Validate() error { type queueSender struct { baseRequestSender - fullName string queue exporterqueue.Queue[Request] numConsumers int traceAttribute attribute.KeyValue - logger *zap.Logger - meter otelmetric.Meter consumers *queue.Consumers[Request] - metricCapacity otelmetric.Int64ObservableGauge - metricSize otelmetric.Int64ObservableGauge + telemetryBuilder *metadata.TelemetryBuilder } func newQueueSender(q exporterqueue.Queue[Request], set exporter.Settings, numConsumers int, - exportFailureMessage string) *queueSender { + exportFailureMessage string, telemetryBuilder *metadata.TelemetryBuilder) *queueSender { qs := &queueSender{ - fullName: set.ID.String(), - queue: q, - numConsumers: numConsumers, - traceAttribute: attribute.String(obsmetrics.ExporterKey, set.ID.String()), - logger: set.TelemetrySettings.Logger, - meter: set.TelemetrySettings.MeterProvider.Meter(scopeName), + queue: q, + numConsumers: numConsumers, + traceAttribute: attribute.String(obsmetrics.ExporterKey, set.ID.String()), + telemetryBuilder: telemetryBuilder, } consumeFunc := func(ctx context.Context, req Request) error { err := qs.nextSender.send(ctx, req) @@ -113,32 +103,10 @@ func (qs *queueSender) Start(ctx context.Context, host component.Host) error { return err } - var err, errs error - - attrs := otelmetric.WithAttributeSet(attribute.NewSet(attribute.String(obsmetrics.ExporterKey, qs.fullName))) - - qs.metricSize, err = qs.meter.Int64ObservableGauge( - obsmetrics.ExporterKey+"/queue_size", - otelmetric.WithDescription("Current size of the retry queue (in batches)"), - otelmetric.WithUnit("1"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(int64(qs.queue.Size()), attrs) - return nil - }), + return multierr.Append( + qs.telemetryBuilder.InitExporterQueueSize(func() int64 { return int64(qs.queue.Size()) }), + qs.telemetryBuilder.InitExporterQueueCapacity(func() int64 { return int64(qs.queue.Capacity()) }), ) - errs = multierr.Append(errs, err) - - qs.metricCapacity, err = qs.meter.Int64ObservableGauge( - obsmetrics.ExporterKey+"/queue_capacity", - otelmetric.WithDescription("Fixed capacity of the retry queue (in batches)"), - otelmetric.WithUnit("1"), - otelmetric.WithInt64Callback(func(_ context.Context, o otelmetric.Int64Observer) error { - o.Observe(int64(qs.queue.Capacity()), attrs) - return nil - })) - - errs = multierr.Append(errs, err) - return errs } // Shutdown is invoked during service shutdown. diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index e04f8b3c2bc..c76b136a4e4 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -18,6 +18,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadata" "go.opentelemetry.io/collector/exporter/exporterqueue" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/internal/queue" @@ -424,7 +425,10 @@ func TestQueuedRetryPersistentEnabled_NoDataLossOnShutdown(t *testing.T) { func TestQueueSenderNoStartShutdown(t *testing.T) { queue := queue.NewBoundedMemoryQueue[Request](queue.MemoryQueueSettings[Request]{}) - qs := newQueueSender(queue, exportertest.NewNopSettings(), 1, "") + set := exportertest.NewNopSettings() + builder, err := metadata.NewTelemetryBuilder(set.TelemetrySettings) + assert.NoError(t, err) + qs := newQueueSender(queue, set, 1, "", builder) assert.NoError(t, qs.Shutdown(context.Background())) } From 1a20888a7cb85bce4ab92a0fc9746c5cfe21f936 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:51:39 -0600 Subject: [PATCH 056/168] [confmap] Write up note about null maps (#10380) #### Link to tracking issue Closes https://github.com/open-telemetry/opentelemetry-collector/issues/9931 --- confmap/README.md | 57 +++++++++++++++++++++++++++++++++++++++++ docs/troubleshooting.md | 4 +++ 2 files changed, 61 insertions(+) diff --git a/confmap/README.md b/confmap/README.md index 42dcf548d89..bfa24c8bcc0 100644 --- a/confmap/README.md +++ b/confmap/README.md @@ -102,3 +102,60 @@ configuration retrieved via the `Provider` used to retrieve the “initial” co ``` The `Resolver` does that by passing an `onChange` func to each `Provider.Retrieve` call and capturing all watch events. + +## Troubleshooting + +### Null Maps + +Due to how our underlying merge library, [koanf](https://github.com/knadh/koanf), behaves, configuration resolution +will treat configuration such as + +```yaml +processors: +``` + +as null, which is a valid value. As a result if you have configuration `A`: + +```yaml +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +service: + extensions: [nop] + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [nop] +``` + +and configuration `B`: + +```yaml +processors: +``` + +and do `./otelcorecol --config A.yaml --config B.yaml` + +The result will be an error: + +``` +Error: invalid configuration: service::pipelines::traces: references processor "nop" which is not configured +2024/06/10 14:37:14 collector server run finished with error: invalid configuration: service::pipelines::traces: references processor "nop" which is not configured +``` + +This happens because configuration `B` sets `processors` to null, removing the `nop` processor defined in configuration `A`, +so the `nop` processor referenced in configuration `A`'s pipeline no longer exists. + +This situation can be remedied 2 ways: +1. Use `{}` when you want to represent an empty map, such as `processors: {}` instead of `processors:`. +2. Omit configuration like `processors:` from your configuration. diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index df9c995c507..c44f3422402 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -322,3 +322,7 @@ error: `The service process could not connect to the service controller`. In this case the `NO_WINDOWS_SERVICE=1` environment variable should be set to force the collector to be started as if it were running in an interactive terminal, without attempting to run as a Windows service. + +### Null Maps in Configuration + +If you've ever experienced issues during configuration resolution where sections, like `processors:` from earlier configuration are removed, see [confmap](../confmap/README.md#troubleshooting) From 2c0ed852db5f3314b08524e8337f3b62c48bd7e8 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 11 Jun 2024 06:01:52 -0700 Subject: [PATCH 057/168] [chore] update gopsutil dep (#10369) Update module github.com/shirou/gopsutil/v3 to v4, replaces https://github.com/open-telemetry/opentelemetry-collector/pull/10303 Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- extension/ballastextension/go.mod | 2 +- extension/ballastextension/go.sum | 4 ++-- extension/memorylimiterextension/go.mod | 2 +- extension/memorylimiterextension/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- internal/iruntime/mem_info.go | 2 +- otelcol/go.mod | 2 +- otelcol/go.sum | 4 ++-- processor/memorylimiterprocessor/go.mod | 2 +- processor/memorylimiterprocessor/go.sum | 4 ++-- service/go.mod | 2 +- service/go.sum | 4 ++-- service/internal/proctelemetry/process_telemetry.go | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index cef5391dfdf..38b481b7fb3 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -71,7 +71,7 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.5 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index cfc2788e940..f518aba913f 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -114,8 +114,8 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= -github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= +github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= +github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index c0715c58028..ffb4a1da914 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -35,7 +35,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index 561e60dbea4..a7e8546981a 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -52,8 +52,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= -github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= +github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= +github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 2b68dbae290..476b695b91b 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -34,7 +34,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index 561e60dbea4..a7e8546981a 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -52,8 +52,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= -github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= +github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= +github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= diff --git a/go.mod b/go.mod index b4c6bab7f18..46df4cc0da8 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ module go.opentelemetry.io/collector go 1.21.0 require ( - github.com/shirou/gopsutil/v3 v3.24.5 + github.com/shirou/gopsutil/v4 v4.24.5 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.102.1 go.opentelemetry.io/collector/confmap v0.102.1 diff --git a/go.sum b/go.sum index 060e6a0293f..20c3845f4eb 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= -github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= +github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= +github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/internal/iruntime/mem_info.go b/internal/iruntime/mem_info.go index fc36fccf7e8..59e53206539 100644 --- a/internal/iruntime/mem_info.go +++ b/internal/iruntime/mem_info.go @@ -4,7 +4,7 @@ package iruntime // import "go.opentelemetry.io/collector/internal/iruntime" import ( - "github.com/shirou/gopsutil/v3/mem" + "github.com/shirou/gopsutil/v4/mem" ) // readMemInfo returns the total memory diff --git a/otelcol/go.mod b/otelcol/go.mod index 3c8640b770f..05e21c25845 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -60,7 +60,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.5 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index 4f1e70623e3..951313f4ce5 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -102,8 +102,8 @@ github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4V github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= -github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= +github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= +github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index aa890028df6..ca55f8d310e 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -38,7 +38,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 721c7422dea..953b3ef0750 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -61,8 +61,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= -github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= +github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= +github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/service/go.mod b/service/go.mod index 5ff0699bb63..e8de1fbc734 100644 --- a/service/go.mod +++ b/service/go.mod @@ -7,7 +7,7 @@ require ( github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.54.0 - github.com/shirou/gopsutil/v3 v3.24.5 + github.com/shirou/gopsutil/v4 v4.24.5 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.102.1 diff --git a/service/go.sum b/service/go.sum index f1cef311079..1b54c08c899 100644 --- a/service/go.sum +++ b/service/go.sum @@ -98,8 +98,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= -github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= +github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= +github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= diff --git a/service/internal/proctelemetry/process_telemetry.go b/service/internal/proctelemetry/process_telemetry.go index 9f8f0874e97..0b978758104 100644 --- a/service/internal/proctelemetry/process_telemetry.go +++ b/service/internal/proctelemetry/process_telemetry.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/shirou/gopsutil/v3/common" - "github.com/shirou/gopsutil/v3/process" + "github.com/shirou/gopsutil/v4/common" + "github.com/shirou/gopsutil/v4/process" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/service/internal/metadata" From f5e279a9f324d1d08714087fbc0bee08ecff309e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 06:19:22 -0700 Subject: [PATCH 058/168] Update All go.opentelemetry.io/collector packages to v0.102.1 (#10381) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [go.opentelemetry.io/collector/exporter/otlpexporter](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.102.0` -> `v0.102.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.102.0/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.102.0/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/exporter/otlphttpexporter](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.102.0` -> `v0.102.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.102.0/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.102.0/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/receiver/otlpreceiver](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.102.0` -> `v0.102.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.102.0/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.102.0/v0.102.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
open-telemetry/opentelemetry-collector (go.opentelemetry.io/collector/exporter/otlpexporter) ### [`v0.102.1`](https://togithub.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v01021) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector/compare/v0.102.0...v0.102.1) **This release addresses [GHSA-c74f-6mfw-mm4v](https://togithub.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `configgrpc`.** ##### 🧰 Bug fixes 🧰 - `configrpc`: Use own compressors for zstd. Before this change, the zstd compressor we used didn't respect the max message size. This addresses [GHSA-c74f-6mfw-mm4v](https://togithub.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `configgrpc` ([#​10323](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10323))
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- internal/e2e/go.mod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index f247b24ca2e..201ce7aa425 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -14,12 +14,12 @@ require ( go.opentelemetry.io/collector/confmap v0.102.1 go.opentelemetry.io/collector/consumer v0.102.1 go.opentelemetry.io/collector/exporter v0.102.1 - go.opentelemetry.io/collector/exporter/otlpexporter v0.102.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1 go.opentelemetry.io/collector/pdata v1.9.0 go.opentelemetry.io/collector/pdata/testdata v0.102.1 go.opentelemetry.io/collector/receiver v0.102.1 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1 go.uber.org/goleak v1.3.0 ) From 1ffece0b96a95b4bae0ef149a8e905815b90cd0f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 06:19:39 -0700 Subject: [PATCH 059/168] Update module golang.org/x/vuln to v1.1.2 (#10383) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | golang.org/x/vuln | `v1.1.1` -> `v1.1.2` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2fvuln/v1.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2fvuln/v1.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2fvuln/v1.1.1/v1.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2fvuln/v1.1.1/v1.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- internal/tools/go.mod | 3 ++- internal/tools/go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index b71d7534ffc..31ba38d946d 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -16,7 +16,7 @@ require ( go.opentelemetry.io/build-tools/semconvgen v0.13.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 golang.org/x/tools v0.22.0 - golang.org/x/vuln v1.1.1 + golang.org/x/vuln v1.1.2 ) require ( @@ -210,6 +210,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.21.0 // indirect + golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index c0fe906fe82..ac677f0fa12 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -573,6 +573,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 h1:FemxDzfMUcK2f3YY4H+05K9CDzbSVr2+q/JKN45pey0= +golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -618,8 +620,8 @@ golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= -golang.org/x/vuln v1.1.1 h1:4nYQg4OSr7uYQMtjuuYqLAEVuTjY4k/CPMYqvv5OPcI= -golang.org/x/vuln v1.1.1/go.mod h1:hNgE+SKMSp2wHVUpW0Ow2ejgKpNJePdML+4YjxrVxik= +golang.org/x/vuln v1.1.2 h1:UkLxe+kAMcrNBpGrFbU0Mc5l7cX97P2nhy21wx5+Qbk= +golang.org/x/vuln v1.1.2/go.mod h1:2o3fRKD8Uz9AraAL3lwd/grWBv+t+SeJnPcqBUJrY24= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 444ddea3094b043b3fe761c72d3c8e80fd3153eb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 06:20:22 -0700 Subject: [PATCH 060/168] Update module google.golang.org/protobuf to v1.34.2 (#10385) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google.golang.org/protobuf](https://togithub.com/protocolbuffers/protobuf-go) | `v1.34.1` -> `v1.34.2` | [![age](https://developer.mend.io/api/mc/badges/age/go/google.golang.org%2fprotobuf/v1.34.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/google.golang.org%2fprotobuf/v1.34.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/google.golang.org%2fprotobuf/v1.34.1/v1.34.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/google.golang.org%2fprotobuf/v1.34.1/v1.34.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
protocolbuffers/protobuf-go (google.golang.org/protobuf) ### [`v1.34.2`](https://togithub.com/protocolbuffers/protobuf-go/releases/tag/v1.34.2) [Compare Source](https://togithub.com/protocolbuffers/protobuf-go/compare/v1.34.1...v1.34.2) Minor feature: - [CL/589336](https://go.dev/cl/589336): gofeatures: allow setting legacy_unmarshal_json_enum feature at file level Minor bug fixes: - [CL/588875](https://go.dev/cl/588875): types/descriptorpb: regenerate using latest protobuf v27.0 release - [CL/586396](https://go.dev/cl/586396): internal/impl: fix size cache semantics with lazy decoding - [CL/585736](https://go.dev/cl/585736): reflect/protodesc: remove obsolete JSON name check from desc validator - [CL/588976](https://go.dev/cl/588976): reflect/protoreflect: FieldDescriptor.Kind should never be GroupKind for maps or fields of map entry
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Yang Song --- cmd/mdatagen/go.mod | 2 +- cmd/mdatagen/go.sum | 4 ++-- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- component/go.mod | 2 +- component/go.sum | 4 ++-- config/configauth/go.mod | 2 +- config/configauth/go.sum | 4 ++-- config/configgrpc/go.mod | 2 +- config/configgrpc/go.sum | 4 ++-- config/confighttp/go.mod | 2 +- config/confighttp/go.sum | 4 ++-- connector/forwardconnector/go.mod | 2 +- connector/forwardconnector/go.sum | 4 ++-- connector/go.mod | 2 +- connector/go.sum | 4 ++-- consumer/go.mod | 2 +- consumer/go.sum | 4 ++-- exporter/debugexporter/go.mod | 2 +- exporter/debugexporter/go.sum | 4 ++-- exporter/go.mod | 2 +- exporter/go.sum | 4 ++-- exporter/loggingexporter/go.mod | 2 +- exporter/loggingexporter/go.sum | 4 ++-- exporter/nopexporter/go.mod | 2 +- exporter/nopexporter/go.sum | 4 ++-- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- extension/auth/go.mod | 2 +- extension/auth/go.sum | 4 ++-- extension/ballastextension/go.mod | 2 +- extension/ballastextension/go.sum | 4 ++-- extension/go.mod | 2 +- extension/go.sum | 4 ++-- extension/memorylimiterextension/go.mod | 2 +- extension/memorylimiterextension/go.sum | 4 ++-- extension/zpagesextension/go.mod | 2 +- extension/zpagesextension/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- internal/e2e/go.mod | 2 +- internal/e2e/go.sum | 4 ++-- otelcol/go.mod | 2 +- otelcol/go.sum | 4 ++-- pdata/go.mod | 2 +- pdata/go.sum | 4 ++-- pdata/pprofile/go.mod | 2 +- pdata/pprofile/go.sum | 4 ++-- pdata/testdata/go.mod | 2 +- pdata/testdata/go.sum | 4 ++-- processor/batchprocessor/go.mod | 2 +- processor/batchprocessor/go.sum | 4 ++-- processor/go.mod | 2 +- processor/go.sum | 4 ++-- processor/memorylimiterprocessor/go.mod | 2 +- processor/memorylimiterprocessor/go.sum | 4 ++-- receiver/go.mod | 2 +- receiver/go.sum | 4 ++-- receiver/nopreceiver/go.mod | 2 +- receiver/nopreceiver/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- service/go.mod | 2 +- service/go.sum | 4 ++-- 66 files changed, 99 insertions(+), 99 deletions(-) diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index e258d63a5fe..db997ca670a 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -52,7 +52,7 @@ require ( golang.org/x/sys v0.20.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 4a4d76787c8..16811877544 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -113,8 +113,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 38b481b7fb3..8258cef0bf2 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -125,7 +125,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index f518aba913f..e50361cfa2d 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -270,8 +270,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/component/go.mod b/component/go.mod index a870abba8d2..b8ed8845c48 100644 --- a/component/go.mod +++ b/component/go.mod @@ -34,7 +34,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/component/go.sum b/component/go.sum index ec205ab4aba..12a53375081 100644 --- a/component/go.sum +++ b/component/go.sum @@ -88,8 +88,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 2d92d1b09cf..6ad2b2633ef 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -33,7 +33,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/config/configauth/go.sum b/config/configauth/go.sum index f058d94d6ae..e2c5ce4ef77 100644 --- a/config/configauth/go.sum +++ b/config/configauth/go.sum @@ -99,8 +99,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index e194105907b..f0eb24ababb 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -62,7 +62,7 @@ require ( golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index f3060f5c932..82748ff4e4c 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -123,8 +123,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 0076f421a53..75116b65f8b 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -58,7 +58,7 @@ require ( golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index 4f94b3ca351..4e5620c8bca 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -120,8 +120,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index ad2489afc17..26d57de278a 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -49,7 +49,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index ace4d10d26a..546bbb07b0c 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -113,8 +113,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/connector/go.mod b/connector/go.mod index c636056da7c..147011cb3d4 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -42,7 +42,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/connector/go.sum b/connector/go.sum index aaa6afbf77b..2eb3a2c9f6c 100644 --- a/connector/go.sum +++ b/connector/go.sum @@ -101,8 +101,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/consumer/go.mod b/consumer/go.mod index 8bf242ef3bd..a70aae0d153 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -23,7 +23,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/consumer/go.sum b/consumer/go.sum index 9fdd717f417..4ae987d011c 100644 --- a/consumer/go.sum +++ b/consumer/go.sum @@ -69,8 +69,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index bb18171ce89..377583db731 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -54,7 +54,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index 9f241ee53bb..84344402540 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -115,8 +115,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/exporter/go.mod b/exporter/go.mod index e015b48b82d..8991711f47b 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -53,7 +53,7 @@ require ( golang.org/x/net v0.25.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/go.sum b/exporter/go.sum index 9f241ee53bb..84344402540 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -115,8 +115,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 8a9989c35b7..29f9a48c551 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -54,7 +54,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 9f241ee53bb..84344402540 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -115,8 +115,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index d9740d3d54c..13509110eec 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -49,7 +49,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index 9f241ee53bb..84344402540 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -115,8 +115,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 6d0446fb591..0626208742e 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -21,7 +21,7 @@ require ( go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 google.golang.org/grpc v1.64.0 - google.golang.org/protobuf v1.34.1 + google.golang.org/protobuf v1.34.2 ) require ( diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 4de11e76a7b..dcd758b8ecb 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -149,8 +149,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 166771069a2..2f8de3691bc 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -19,7 +19,7 @@ require ( go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 google.golang.org/grpc v1.64.0 - google.golang.org/protobuf v1.34.1 + google.golang.org/protobuf v1.34.2 ) require ( diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 8d9539618fb..7099d300c45 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -151,8 +151,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/extension/auth/go.mod b/extension/auth/go.mod index fb61f5aed5b..3cf28c7d313 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -43,7 +43,7 @@ require ( golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/auth/go.sum b/extension/auth/go.sum index 000c077e9bc..fccc711bc09 100644 --- a/extension/auth/go.sum +++ b/extension/auth/go.sum @@ -100,8 +100,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index ffb4a1da914..ced6dd46d5a 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -53,7 +53,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index a7e8546981a..1650970f7f5 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -121,8 +121,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/extension/go.mod b/extension/go.mod index a681c080970..dbd1c36466f 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -43,7 +43,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/go.sum b/extension/go.sum index 3ca262fb778..4f000f30f43 100644 --- a/extension/go.sum +++ b/extension/go.sum @@ -102,8 +102,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 476b695b91b..80af7eb38be 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -52,7 +52,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index a7e8546981a..1650970f7f5 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -121,8 +121,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index f44f97d235f..e0888a4d847 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -59,7 +59,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index 175064a2c97..ae3ffab16e5 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -128,8 +128,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/go.mod b/go.mod index 46df4cc0da8..6450a51aca6 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 20c3845f4eb..58945fcad80 100644 --- a/go.sum +++ b/go.sum @@ -156,8 +156,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 201ce7aa425..cc0433ea953 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -87,7 +87,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 74e784f557b..964202164de 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -155,8 +155,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/otelcol/go.mod b/otelcol/go.mod index 05e21c25845..ad300862725 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -94,7 +94,7 @@ require ( gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect ) replace go.opentelemetry.io/collector => ../ diff --git a/otelcol/go.sum b/otelcol/go.sum index 951313f4ce5..280b516b6dc 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -254,8 +254,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/pdata/go.mod b/pdata/go.mod index 72b6b3821cb..09a353fd198 100644 --- a/pdata/go.mod +++ b/pdata/go.mod @@ -9,7 +9,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 google.golang.org/grpc v1.64.0 - google.golang.org/protobuf v1.34.1 + google.golang.org/protobuf v1.34.2 ) require ( diff --git a/pdata/go.sum b/pdata/go.sum index fb87926ab78..be243103fda 100644 --- a/pdata/go.sum +++ b/pdata/go.sum @@ -74,8 +74,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod index 76e0d91d9ad..223daa72e20 100644 --- a/pdata/pprofile/go.mod +++ b/pdata/pprofile/go.mod @@ -20,7 +20,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pdata/pprofile/go.sum b/pdata/pprofile/go.sum index d4ff00537b4..5a85f63bae2 100644 --- a/pdata/pprofile/go.sum +++ b/pdata/pprofile/go.sum @@ -58,8 +58,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/pdata/testdata/go.mod b/pdata/testdata/go.mod index 547a6ba16e3..7e710eea35b 100644 --- a/pdata/testdata/go.mod +++ b/pdata/testdata/go.mod @@ -15,7 +15,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect ) replace go.opentelemetry.io/collector/pdata => ../ diff --git a/pdata/testdata/go.sum b/pdata/testdata/go.sum index 3dc378522b4..a2e9971059c 100644 --- a/pdata/testdata/go.sum +++ b/pdata/testdata/go.sum @@ -62,7 +62,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index d64b1e53b17..2309194d06f 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -50,7 +50,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index ace4d10d26a..546bbb07b0c 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -113,8 +113,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/processor/go.mod b/processor/go.mod index eb908c75d49..69688a9a3ef 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -42,7 +42,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/go.sum b/processor/go.sum index aaa6afbf77b..2eb3a2c9f6c 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -101,8 +101,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index ca55f8d310e..8ebdbe38b0c 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -57,7 +57,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 953b3ef0750..009467e0b8b 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -132,8 +132,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/receiver/go.mod b/receiver/go.mod index e40ddd8725b..dcc78322179 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -41,7 +41,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/go.sum b/receiver/go.sum index aaa6afbf77b..2eb3a2c9f6c 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -101,8 +101,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index 12792d8f460..b385a695a65 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -48,7 +48,7 @@ require ( golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/nopreceiver/go.sum b/receiver/nopreceiver/go.sum index ace4d10d26a..546bbb07b0c 100644 --- a/receiver/nopreceiver/go.sum +++ b/receiver/nopreceiver/go.sum @@ -113,8 +113,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index fa6e6898f8d..e84348cac8b 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -21,7 +21,7 @@ require ( go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 google.golang.org/grpc v1.64.0 - google.golang.org/protobuf v1.34.1 + google.golang.org/protobuf v1.34.2 ) require ( diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 74e784f557b..964202164de 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -155,8 +155,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/service/go.mod b/service/go.mod index e8de1fbc734..b5b5f8517c8 100644 --- a/service/go.mod +++ b/service/go.mod @@ -85,7 +85,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/service/go.sum b/service/go.sum index 1b54c08c899..06ff3b65946 100644 --- a/service/go.sum +++ b/service/go.sum @@ -246,8 +246,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 9361a768a7a65991e57138b719667f7e5f9d1f28 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 11 Jun 2024 06:26:19 -0700 Subject: [PATCH 061/168] [chore] update deprecated goreleaser flag (#10386) This flag is being removed in the latest version, see https://goreleaser.com/deprecations/#-rm-dist Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/builder-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index e827965c792..9d6fdb4993c 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -22,7 +22,7 @@ jobs: with: distribution: goreleaser-pro version: latest - args: release --rm-dist -f cmd/builder/.goreleaser.yml + args: release --clean -f cmd/builder/.goreleaser.yml env: GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From f10e1be08089c41273e94693df9b0fcdaaf70a36 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 06:26:42 -0700 Subject: [PATCH 062/168] Update goreleaser/goreleaser-action action to v6 (#10384) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [goreleaser/goreleaser-action](https://togithub.com/goreleaser/goreleaser-action) | action | major | `v5.1.0` -> `v6.0.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
goreleaser/goreleaser-action (goreleaser/goreleaser-action) ### [`v6.0.0`](https://togithub.com/goreleaser/goreleaser-action/releases/tag/v6.0.0) [Compare Source](https://togithub.com/goreleaser/goreleaser-action/compare/v5.1.0...v6.0.0) > \[!WARNING] > **This is a breaking change!** > > Follow the instructions [here](https://goreleaser.com/blog/goreleaser-v2/#upgrading) to upgrade! #### What's Changed - feat!: use "~> v2" as default by [@​caarlos0](https://togithub.com/caarlos0) in [https://github.com/goreleaser/goreleaser-action/pull/463](https://togithub.com/goreleaser/goreleaser-action/pull/463) **Full Changelog**: https://github.com/goreleaser/goreleaser-action/compare/v5...v6.0.0
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/builder-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 9d6fdb4993c..38a9f67fbfa 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -18,7 +18,7 @@ jobs: with: go-version: ~1.21.5 - name: Run GoReleaser - uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0 + uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 with: distribution: goreleaser-pro version: latest From 7dfb57b9ad1c82fcce5ab26541a29b264ae7670c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 07:31:28 -0700 Subject: [PATCH 063/168] Update module github.com/golangci/golangci-lint to v1.59.1 (#10382) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/golangci/golangci-lint](https://togithub.com/golangci/golangci-lint) | `v1.59.0` -> `v1.59.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgolangci%2fgolangci-lint/v1.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fgolangci%2fgolangci-lint/v1.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fgolangci%2fgolangci-lint/v1.59.0/v1.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgolangci%2fgolangci-lint/v1.59.0/v1.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
golangci/golangci-lint (github.com/golangci/golangci-lint) ### [`v1.59.1`](https://togithub.com/golangci/golangci-lint/releases/tag/v1.59.1) [Compare Source](https://togithub.com/golangci/golangci-lint/compare/v1.59.0...v1.59.1) `golangci-lint` is a free and open-source project built by volunteers. If you value it, consider supporting us, the [maintainers](https://opencollective.com/golangci-lint) and [linter authors](https://golangci-lint.run/product/thanks/). We appreciate it! :heart: For key updates, see the [changelog](https://golangci-lint.run/product/changelog/#​1591). #### Changelog - [`f738736`](https://togithub.com/golangci/golangci-lint/commit/f7387361) build(deps): bump github.com/Antonboom/testifylint from 1.3.0 to 1.3.1 ([#​4759](https://togithub.com/golangci/golangci-lint/issues/4759)) - [`44b3cdd`](https://togithub.com/golangci/golangci-lint/commit/44b3cdd1) build(deps): bump github.com/go-viper/mapstructure/v2 from 2.0.0-alpha.1 to 2.0.0 ([#​4788](https://togithub.com/golangci/golangci-lint/issues/4788)) - [`1a55854`](https://togithub.com/golangci/golangci-lint/commit/1a55854a) build(deps): bump github.com/golangci/misspell from 0.5.1 to 0.6.0 ([#​4804](https://togithub.com/golangci/golangci-lint/issues/4804)) - [`9a7a1ad`](https://togithub.com/golangci/golangci-lint/commit/9a7a1ad4) build(deps): bump github.com/polyfloyd/go-errorlint from 1.5.1 to 1.5.2 ([#​4785](https://togithub.com/golangci/golangci-lint/issues/4785)) - [`aaff918`](https://togithub.com/golangci/golangci-lint/commit/aaff9184) build(deps): bump github.com/sashamelentyev/usestdlibvars from 1.25.0 to 1.26.0 ([#​4801](https://togithub.com/golangci/golangci-lint/issues/4801)) - [`a0d2c83`](https://togithub.com/golangci/golangci-lint/commit/a0d2c830) build(deps): bump github.com/shirou/gopsutil/v3 from 3.24.4 to 3.24.5 ([#​4782](https://togithub.com/golangci/golangci-lint/issues/4782)) - [`2042b1f`](https://togithub.com/golangci/golangci-lint/commit/2042b1f1) build(deps): bump go-simpler.org/sloglint from 0.7.0 to 0.7.1 ([#​4784](https://togithub.com/golangci/golangci-lint/issues/4784)) - [`327a78a`](https://togithub.com/golangci/golangci-lint/commit/327a78a8) build(deps): bump golang.org/x/tools from 0.21.0 to 0.22.0 ([#​4802](https://togithub.com/golangci/golangci-lint/issues/4802)) - [`e1a8055`](https://togithub.com/golangci/golangci-lint/commit/e1a80557) fix: SARIF format require issue column >= 1 ([#​4775](https://togithub.com/golangci/golangci-lint/issues/4775)) - [`88f60c8`](https://togithub.com/golangci/golangci-lint/commit/88f60c8c) fix: gomnd deprecated configuration compatibility ([#​4768](https://togithub.com/golangci/golangci-lint/issues/4768)) - [`8173166`](https://togithub.com/golangci/golangci-lint/commit/81731668) fix: init empty result slice for SARIF printer ([#​4758](https://togithub.com/golangci/golangci-lint/issues/4758)) - [`02740ea`](https://togithub.com/golangci/golangci-lint/commit/02740ea1) intrange: add style preset ([#​4797](https://togithub.com/golangci/golangci-lint/issues/4797)) - [`615b873`](https://togithub.com/golangci/golangci-lint/commit/615b873d) unparam: bump to HEAD ([#​4786](https://togithub.com/golangci/golangci-lint/issues/4786))
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Yang Song --- internal/tools/go.mod | 16 ++++++++-------- internal/tools/go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 31ba38d946d..85ccda0bd6b 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -5,7 +5,7 @@ go 1.21.0 require ( github.com/a8m/envsubst v1.4.2 github.com/client9/misspell v0.3.4 - github.com/golangci/golangci-lint v1.59.0 + github.com/golangci/golangci-lint v1.59.1 github.com/google/addlicense v1.1.1 github.com/jcchavezs/porto v0.6.0 github.com/pavius/impi v0.0.3 @@ -27,7 +27,7 @@ require ( github.com/Abirdcfly/dupword v0.0.14 // indirect github.com/Antonboom/errname v0.1.13 // indirect github.com/Antonboom/nilnil v0.1.9 // indirect - github.com/Antonboom/testifylint v1.3.0 // indirect + github.com/Antonboom/testifylint v1.3.1 // indirect github.com/BurntSushi/toml v1.4.0 // indirect github.com/Crocmagnon/fatcontext v0.2.2 // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect @@ -83,14 +83,14 @@ require ( github.com/go-toolsmith/astp v1.1.0 // indirect github.com/go-toolsmith/strparse v1.1.0 // indirect github.com/go-toolsmith/typep v1.1.0 // indirect - github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/go-viper/mapstructure/v2 v2.0.0 // indirect github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect - github.com/golangci/misspell v0.5.1 // indirect + github.com/golangci/misspell v0.6.0 // indirect github.com/golangci/modinfo v0.3.4 // indirect github.com/golangci/plugin-module-register v0.1.1 // indirect github.com/golangci/revgrep v0.5.3 // indirect @@ -144,7 +144,7 @@ require ( github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/polyfloyd/go-errorlint v1.5.1 // indirect + github.com/polyfloyd/go-errorlint v1.5.2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.48.0 // indirect @@ -161,7 +161,7 @@ require ( github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect github.com/sashamelentyev/interfacebloat v1.1.0 // indirect - github.com/sashamelentyev/usestdlibvars v1.25.0 // indirect + github.com/sashamelentyev/usestdlibvars v1.26.0 // indirect github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect github.com/sergi/go-diff v1.1.0 // indirect github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect @@ -199,7 +199,7 @@ require ( github.com/ykadowak/zerologlint v0.1.5 // indirect gitlab.com/bosi/decorder v0.4.2 // indirect go-simpler.org/musttag v0.12.2 // indirect - go-simpler.org/sloglint v0.7.0 // indirect + go-simpler.org/sloglint v0.7.1 // indirect go.opentelemetry.io/build-tools v0.13.0 // indirect go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -219,7 +219,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect honnef.co/go/tools v0.4.7 // indirect mvdan.cc/gofumpt v0.6.0 // indirect - mvdan.cc/unparam v0.0.0-20240427195214-063aff900ca1 // indirect + mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect ) retract ( diff --git a/internal/tools/go.sum b/internal/tools/go.sum index ac677f0fa12..f328b85ea81 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -12,8 +12,8 @@ github.com/Antonboom/errname v0.1.13 h1:JHICqsewj/fNckzrfVSe+T33svwQxmjC+1ntDsHO github.com/Antonboom/errname v0.1.13/go.mod h1:uWyefRYRN54lBg6HseYCFhs6Qjcy41Y3Jl/dVhA87Ns= github.com/Antonboom/nilnil v0.1.9 h1:eKFMejSxPSA9eLSensFmjW2XTgTwJMjZ8hUHtV4s/SQ= github.com/Antonboom/nilnil v0.1.9/go.mod h1:iGe2rYwCq5/Me1khrysB4nwI7swQvjclR8/YRPl5ihQ= -github.com/Antonboom/testifylint v1.3.0 h1:UiqrddKs1W3YK8R0TUuWwrVKlVAnS07DTUVWWs9c+y4= -github.com/Antonboom/testifylint v1.3.0/go.mod h1:NV0hTlteCkViPW9mSR4wEMfwp+Hs1T3dY60bkvSfhpM= +github.com/Antonboom/testifylint v1.3.1 h1:Uam4q1Q+2b6H7gvk9RQFw6jyVDdpzIirFOOrbs14eG4= +github.com/Antonboom/testifylint v1.3.1/go.mod h1:NV0hTlteCkViPW9mSR4wEMfwp+Hs1T3dY60bkvSfhpM= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/Crocmagnon/fatcontext v0.2.2 h1:OrFlsDdOj9hW/oBEJBNSuH7QWf+E9WPVHw+x52bXVbk= @@ -157,8 +157,8 @@ github.com/go-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQi github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ= github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus= github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= -github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-viper/mapstructure/v2 v2.0.0 h1:dhn8MZ1gZ0mzeodTG3jt5Vj/o87xZKuNAprG2mQfMfc= +github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80U= github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= @@ -171,10 +171,10 @@ github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e h1:ULcKCDV1LOZPFxGZaA6TlQbiM3J2GCPnkx/bGF6sX/g= github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e/go.mod h1:Pm5KhLPA8gSnQwrQ6ukebRcapGb/BG9iUkdaiCcGHJM= -github.com/golangci/golangci-lint v1.59.0 h1:st69YDnAH/v2QXDcgUaZ0seQajHScPALBVkyitYLXEk= -github.com/golangci/golangci-lint v1.59.0/go.mod h1:QNA32UWdUdHXnu+Ap5/ZU4WVwyp2tL94UxEXrSErjg0= -github.com/golangci/misspell v0.5.1 h1:/SjR1clj5uDjNLwYzCahHwIOPmQgoH04AyQIiWGbhCM= -github.com/golangci/misspell v0.5.1/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo= +github.com/golangci/golangci-lint v1.59.1 h1:CRRLu1JbhK5avLABFJ/OHVSQ0Ie5c4ulsOId1h3TTks= +github.com/golangci/golangci-lint v1.59.1/go.mod h1:jX5Oif4C7P0j9++YB2MMJmoNrb01NJ8ITqKWNLewThg= +github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs= +github.com/golangci/misspell v0.6.0/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo= github.com/golangci/modinfo v0.3.4 h1:oU5huX3fbxqQXdfspamej74DFX0kyGLkw1ppvXoJ8GA= github.com/golangci/modinfo v0.3.4/go.mod h1:wytF1M5xl9u0ij8YSvhkEVPP3M5Mc7XLl1pxH3B2aUM= github.com/golangci/plugin-module-register v0.1.1 h1:TCmesur25LnyJkpsVrupv1Cdzo+2f7zX0H6Jkw1Ol6c= @@ -327,8 +327,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v1.5.1 h1:5gHxDjLyyWij7fhfrjYNNlHsUNQeyx0LFQKUelO3RBo= -github.com/polyfloyd/go-errorlint v1.5.1/go.mod h1:sH1QC1pxxi0fFecsVIzBmxtrgd9IF/SkJpA6wqyKAJs= +github.com/polyfloyd/go-errorlint v1.5.2 h1:SJhVik3Umsjh7mte1vE0fVZ5T1gznasQG3PV7U5xFdA= +github.com/polyfloyd/go-errorlint v1.5.2/go.mod h1:sH1QC1pxxi0fFecsVIzBmxtrgd9IF/SkJpA6wqyKAJs= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= @@ -366,8 +366,8 @@ github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6Ng github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY= github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw= github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= -github.com/sashamelentyev/usestdlibvars v1.25.0 h1:IK8SI2QyFzy/2OD2PYnhy84dpfNo9qADrRt6LH8vSzU= -github.com/sashamelentyev/usestdlibvars v1.25.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= +github.com/sashamelentyev/usestdlibvars v1.26.0 h1:LONR2hNVKxRmzIrZR0PhSF3mhCAzvnr+DcUiHgREfXE= +github.com/sashamelentyev/usestdlibvars v1.26.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 h1:rnO6Zp1YMQwv8AyxzuwsVohljJgp4L0ZqiCgtACsPsc= github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9/go.mod h1:dg7lPlu/xK/Ut9SedURCoZbVCR4yC7fM65DtH9/CDHs= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= @@ -469,8 +469,8 @@ go-simpler.org/assert v0.9.0 h1:PfpmcSvL7yAnWyChSjOz6Sp6m9j5lyK8Ok9pEL31YkQ= go-simpler.org/assert v0.9.0/go.mod h1:74Eqh5eI6vCK6Y5l3PI8ZYFXG4Sa+tkr70OIPJAUr28= go-simpler.org/musttag v0.12.2 h1:J7lRc2ysXOq7eM8rwaTYnNrHd5JwjppzB6mScysB2Cs= go-simpler.org/musttag v0.12.2/go.mod h1:uN1DVIasMTQKk6XSik7yrJoEysGtR2GRqvWnI9S7TYM= -go-simpler.org/sloglint v0.7.0 h1:rMZRxD9MbaGoRFobIOicMxZzum7AXNFDlez6xxJs5V4= -go-simpler.org/sloglint v0.7.0/go.mod h1:g9SXiSWY0JJh4LS39/Q0GxzP/QX2cVcbTOYhDpXrJEs= +go-simpler.org/sloglint v0.7.1 h1:qlGLiqHbN5islOxjeLXoPtUdZXb669RW+BDQ+xOSNoU= +go-simpler.org/sloglint v0.7.1/go.mod h1:OlaVDRh/FKKd4X4sIMbsz8st97vomydceL146Fthh/c= go.opentelemetry.io/build-tools v0.13.0 h1:0I3jJQ2zcJU8k4ZjyHNqUBX2Len1UvBIOzVP4b50g9A= go.opentelemetry.io/build-tools v0.13.0/go.mod h1:PEtg5iWjNI9WAlKXP/xll/hgbq/Cp4Ma4T1ssKB2T0Q= go.opentelemetry.io/build-tools/checkfile v0.13.0 h1:Nq13fOLpF9T+y4birZbfv6JurFC1Pla5UwC+t0GMbAo= @@ -647,5 +647,5 @@ honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs= honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo= mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA= -mvdan.cc/unparam v0.0.0-20240427195214-063aff900ca1 h1:Nykk7fggxChwLK4rUPYESzeIwqsuxXXlFEAh5YhaMRo= -mvdan.cc/unparam v0.0.0-20240427195214-063aff900ca1/go.mod h1:ZzZjEpJDOmx8TdVU6umamY3Xy0UAQUI2DHbf05USVbI= +mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f h1:lMpcwN6GxNbWtbpI1+xzFLSW8XzX0u72NttUGVFjO3U= +mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f/go.mod h1:RSLa7mKKCNeTTMHBw5Hsy2rfJmd6O2ivt9Dw9ZqCQpQ= From e4a1f5bbf4419f4888775899c68f6e17dd024d79 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Wed, 12 Jun 2024 05:31:55 -0600 Subject: [PATCH 064/168] [confmap] Only log error in expandconverter if expansion actually happens (#10392) #### Description Fix a bug where we printed a warning log when we were not expanding a value #### Link to tracking issue Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/10356 #### Testing Tested manually --- .chloggen/confmap-fix-log.yaml | 25 +++++++++++++++++++++ confmap/converter/expandconverter/expand.go | 16 +++++++------ 2 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 .chloggen/confmap-fix-log.yaml diff --git a/.chloggen/confmap-fix-log.yaml b/.chloggen/confmap-fix-log.yaml new file mode 100644 index 00000000000..dadb11ca31f --- /dev/null +++ b/.chloggen/confmap-fix-log.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: expandconverter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix bug where an warning was logged incorrectly. + +# One or more tracking issues or pull requests related to the change +issues: [10392] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/confmap/converter/expandconverter/expand.go b/confmap/converter/expandconverter/expand.go index 029b48eaf17..ecac0cdaa25 100644 --- a/confmap/converter/expandconverter/expand.go +++ b/confmap/converter/expandconverter/expand.go @@ -80,6 +80,14 @@ func (c converter) expandStringValues(value any) (any, error) { func (c converter) expandEnv(s string) (string, error) { var err error res := os.Expand(s, func(str string) string { + // This allows escaping environment variable substitution via $$, e.g. + // - $FOO will be substituted with env var FOO + // - $$FOO will be replaced with $FOO + // - $$$FOO will be replaced with $ + substituted env var FOO + if str == "$" { + return "$" + } + // Matches on $VAR style environment variables // in order to make sure we don't log a warning for ${VAR} var regex = regexp.MustCompile(fmt.Sprintf(`\$%s`, regexp.QuoteMeta(str))) @@ -88,13 +96,7 @@ func (c converter) expandEnv(s string) (string, error) { c.logger.Warn(msg, zap.String("variable", str)) c.loggedDeprecations[str] = struct{}{} } - // This allows escaping environment variable substitution via $$, e.g. - // - $FOO will be substituted with env var FOO - // - $$FOO will be replaced with $FOO - // - $$$FOO will be replaced with $ + substituted env var FOO - if str == "$" { - return "$" - } + // For $ENV style environment variables os.Expand returns once it hits a character that isn't an underscore or // an alphanumeric character - so we cannot detect those malformed environment variables. // For ${ENV} style variables we can detect those kinds of env var names! From 3996c58bad1841a6999c1667d44a2bca41f9c847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Wed, 12 Jun 2024 17:57:56 +0200 Subject: [PATCH 065/168] [configgrpc] Revert to third-party compressor for zstd (#10394) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We switched back to our compression logic for zstd when a CVE was found on the third-party library we were using. Now that the third-party library has been fixed, we can revert to that one. For end-users, this has no practical effect. The reproducers for the CVE were tested against this patch, confirming we are not reintroducing the bugs. Signed-off-by: Juraci Paixão Kröhling --------- Signed-off-by: Juraci Paixão Kröhling --- .chloggen/jpkroehling_revert-zstd.yaml | 25 ++++++ config/configgrpc/configgrpc.go | 4 +- .../configgrpc/configgrpc_benchmark_test.go | 4 +- config/configgrpc/go.mod | 2 +- config/configgrpc/internal/zstd.go | 83 ------------------- config/configgrpc/internal/zstd_test.go | 41 --------- 6 files changed, 30 insertions(+), 129 deletions(-) create mode 100644 .chloggen/jpkroehling_revert-zstd.yaml delete mode 100644 config/configgrpc/internal/zstd.go delete mode 100644 config/configgrpc/internal/zstd_test.go diff --git a/.chloggen/jpkroehling_revert-zstd.yaml b/.chloggen/jpkroehling_revert-zstd.yaml new file mode 100644 index 00000000000..768888bf1a8 --- /dev/null +++ b/.chloggen/jpkroehling_revert-zstd.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: configgrpc + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Revert the zstd compression for gRPC to the third-party library we were using previously. + +# One or more tracking issues or pull requests related to the change +issues: [10394] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: We switched back to our compression logic for zstd when a CVE was found on the third-party library we were using. Now that the third-party library has been fixed, we can revert to that one. For end-users, this has no practical effect. The reproducers for the CVE were tested against this patch, confirming we are not reintroducing the bugs. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/config/configgrpc/configgrpc.go b/config/configgrpc/configgrpc.go index e64b87142ca..87e7b83d766 100644 --- a/config/configgrpc/configgrpc.go +++ b/config/configgrpc/configgrpc.go @@ -12,6 +12,7 @@ import ( "time" "github.com/mostynb/go-grpc-compression/nonclobbering/snappy" + "github.com/mostynb/go-grpc-compression/nonclobbering/zstd" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel" "google.golang.org/grpc" @@ -27,7 +28,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/configcompression" - grpcInternal "go.opentelemetry.io/collector/config/configgrpc/internal" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtelemetry" @@ -426,7 +426,7 @@ func getGRPCCompressionName(compressionType configcompression.Type) (string, err case configcompression.TypeSnappy: return snappy.Name, nil case configcompression.TypeZstd: - return grpcInternal.ZstdName, nil + return zstd.Name, nil default: return "", fmt.Errorf("unsupported compression type %q", compressionType) } diff --git a/config/configgrpc/configgrpc_benchmark_test.go b/config/configgrpc/configgrpc_benchmark_test.go index 3254655e9ec..1ad755f2b4f 100644 --- a/config/configgrpc/configgrpc_benchmark_test.go +++ b/config/configgrpc/configgrpc_benchmark_test.go @@ -10,12 +10,12 @@ import ( "testing" "github.com/mostynb/go-grpc-compression/nonclobbering/snappy" + "github.com/mostynb/go-grpc-compression/nonclobbering/zstd" "google.golang.org/grpc/codes" "google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding/gzip" "google.golang.org/grpc/status" - "go.opentelemetry.io/collector/config/configgrpc/internal" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -27,7 +27,7 @@ func BenchmarkCompressors(b *testing.B) { compressors := make([]encoding.Compressor, 0) compressors = append(compressors, encoding.GetCompressor(gzip.Name)) - compressors = append(compressors, encoding.GetCompressor(internal.ZstdName)) + compressors = append(compressors, encoding.GetCompressor(zstd.Name)) compressors = append(compressors, encoding.GetCompressor(snappy.Name)) for _, payload := range payloads { diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index f0eb24ababb..8c81e8cdb58 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -3,7 +3,6 @@ module go.opentelemetry.io/collector/config/configgrpc go 1.21.0 require ( - github.com/klauspost/compress v1.17.8 github.com/mostynb/go-grpc-compression v1.2.3 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.102.1 @@ -37,6 +36,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.17.8 // indirect 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.1.1 // indirect diff --git a/config/configgrpc/internal/zstd.go b/config/configgrpc/internal/zstd.go deleted file mode 100644 index 0718b73535f..00000000000 --- a/config/configgrpc/internal/zstd.go +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright The OpenTelemetry Authors -// Copyright 2017 gRPC authors -// SPDX-License-Identifier: Apache-2.0 - -package internal // import "go.opentelemetry.io/collector/config/configgrpc/internal" - -import ( - "errors" - "io" - "sync" - - "github.com/klauspost/compress/zstd" - "google.golang.org/grpc/encoding" -) - -const ZstdName = "zstd" - -func init() { - encoding.RegisterCompressor(NewZstdCodec()) -} - -type writer struct { - *zstd.Encoder - pool *sync.Pool -} - -func NewZstdCodec() encoding.Compressor { - c := &compressor{} - c.poolCompressor.New = func() any { - zw, _ := zstd.NewWriter(nil, zstd.WithEncoderConcurrency(1), zstd.WithWindowSize(512*1024)) - return &writer{Encoder: zw, pool: &c.poolCompressor} - } - return c -} - -func (c *compressor) Compress(w io.Writer) (io.WriteCloser, error) { - z := c.poolCompressor.Get().(*writer) - z.Encoder.Reset(w) - return z, nil -} - -func (z *writer) Close() error { - defer z.pool.Put(z) - return z.Encoder.Close() -} - -type reader struct { - *zstd.Decoder - pool *sync.Pool -} - -func (c *compressor) Decompress(r io.Reader) (io.Reader, error) { - z, inPool := c.poolDecompressor.Get().(*reader) - if !inPool { - newZ, err := zstd.NewReader(r) - if err != nil { - return nil, err - } - return &reader{Decoder: newZ, pool: &c.poolDecompressor}, nil - } - if err := z.Reset(r); err != nil { - c.poolDecompressor.Put(z) - return nil, err - } - return z, nil -} - -func (z *reader) Read(p []byte) (n int, err error) { - n, err = z.Decoder.Read(p) - if errors.Is(err, io.EOF) { - z.pool.Put(z) - } - return n, err -} - -func (c *compressor) Name() string { - return ZstdName -} - -type compressor struct { - poolCompressor sync.Pool - poolDecompressor sync.Pool -} diff --git a/config/configgrpc/internal/zstd_test.go b/config/configgrpc/internal/zstd_test.go deleted file mode 100644 index e16336c8ccb..00000000000 --- a/config/configgrpc/internal/zstd_test.go +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package internal - -import ( - "bytes" - "io" - "testing" - - "github.com/stretchr/testify/require" -) - -func Test_zstdCodec_CompressDecompress(t *testing.T) { - // prepare - msg := []byte("Hello world.") - compressed := &bytes.Buffer{} - - // zstd header, for sanity checking - header := []byte{40, 181, 47, 253} - - c := NewZstdCodec() - cWriter, err := c.Compress(compressed) - require.NoError(t, err) - require.NotNil(t, cWriter) - - _, err = cWriter.Write(msg) - require.NoError(t, err) - cWriter.Close() - - cReader, err := c.Decompress(compressed) - require.NoError(t, err) - require.NotNil(t, cReader) - - uncompressed, err := io.ReadAll(cReader) - require.NoError(t, err) - require.Equal(t, msg, uncompressed) - - // test header - require.Equal(t, header, compressed.Bytes()[:4]) -} From 964e3a95872e452e0cde6bb644786bac57c46bb9 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Wed, 12 Jun 2024 10:23:15 -0600 Subject: [PATCH 066/168] [otelcol] Add new command to start erroring on empty providers (#10359) Add a featuregate to cause an error when no providers or converters are set in `CollectorSettings` that are passed to `NewCommand`. Also deprecate the functions in `otelcoltest` with versions that require `ConfigProviderSettings` so that all providers and converters deps can be removed when the feature gate is stable. Works towards https://github.com/open-telemetry/opentelemetry-collector/issues/10290. End state goal here: https://github.com/open-telemetry/opentelemetry-collector/pull/10357 --------- Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- ...elcol-default-providers-featuregate-2.yaml | 25 +++++++++++++ ...otelcol-default-providers-featuregate.yaml | 25 +++++++++++++ otelcol/collector_windows.go | 2 +- otelcol/command.go | 24 ++++++++++-- otelcol/command_components_test.go | 2 +- otelcol/command_test.go | 34 +++++++++++++---- otelcol/command_validate.go | 4 +- otelcol/command_validate_test.go | 4 +- otelcol/otelcoltest/config.go | 37 +++++++++++++++++-- otelcol/otelcoltest/config_test.go | 37 +++++++++++++++++-- 10 files changed, 171 insertions(+), 23 deletions(-) create mode 100644 .chloggen/otelcol-default-providers-featuregate-2.yaml create mode 100644 .chloggen/otelcol-default-providers-featuregate.yaml diff --git a/.chloggen/otelcol-default-providers-featuregate-2.yaml b/.chloggen/otelcol-default-providers-featuregate-2.yaml new file mode 100644 index 00000000000..f6025aac200 --- /dev/null +++ b/.chloggen/otelcol-default-providers-featuregate-2.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate `otelcol.NewCommand`. Use `otelcol.NewCommandMustProviderSettings` instead. + +# One or more tracking issues or pull requests related to the change +issues: [10359] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/.chloggen/otelcol-default-providers-featuregate.yaml b/.chloggen/otelcol-default-providers-featuregate.yaml new file mode 100644 index 00000000000..d7c16250475 --- /dev/null +++ b/.chloggen/otelcol-default-providers-featuregate.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcoltest + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate `LoadConfig` and `LoadConfigAndValidate`. Use `LoadConfigWithSettings` and `LoadConfigAndValidateWithSettings` instead + +# One or more tracking issues or pull requests related to the change +issues: [10359] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/otelcol/collector_windows.go b/otelcol/collector_windows.go index 3df08386bbf..142c811eecc 100644 --- a/otelcol/collector_windows.go +++ b/otelcol/collector_windows.go @@ -83,7 +83,7 @@ func (s *windowsService) start(elog *eventlog.Log, colErrorChannel chan error) e } var err error - err = updateSettingsUsingFlags(&s.settings, s.flags) + err = updateSettingsUsingFlags(&s.settings, s.flags, false) if err != nil { return err } diff --git a/otelcol/command.go b/otelcol/command.go index 648b3a5ffda..db336c34cfb 100644 --- a/otelcol/command.go +++ b/otelcol/command.go @@ -16,14 +16,29 @@ import ( // Any URIs specified in CollectorSettings.ConfigProviderSettings.ResolverSettings.URIs // are considered defaults and will be overwritten by config flags passed as // command-line arguments to the executable. +// +// Deprecated: [v0.103.0] use NewCommandMustSetProvider instead func NewCommand(set CollectorSettings) *cobra.Command { + return commandHelper(set, false) +} + +// NewCommandMustSetProvider constructs a new cobra.Command using the given CollectorSettings. +// Any URIs specified in CollectorSettings.ConfigProviderSettings.ResolverSettings.URIs +// are considered defaults and will be overwritten by config flags passed as +// command-line arguments to the executable. +// At least one Provider must be supplied via CollectorSettings.ConfigProviderSettings.ResolverSettings.ProviderFactories. +func NewCommandMustSetProvider(set CollectorSettings) *cobra.Command { + return commandHelper(set, true) +} + +func commandHelper(set CollectorSettings, enforceProviders bool) *cobra.Command { flagSet := flags(featuregate.GlobalRegistry()) rootCmd := &cobra.Command{ Use: set.BuildInfo.Command, Version: set.BuildInfo.Version, SilenceUsage: true, RunE: func(cmd *cobra.Command, _ []string) error { - err := updateSettingsUsingFlags(&set, flagSet) + err := updateSettingsUsingFlags(&set, flagSet, enforceProviders) if err != nil { return err } @@ -36,13 +51,13 @@ func NewCommand(set CollectorSettings) *cobra.Command { }, } rootCmd.AddCommand(newComponentsCommand(set)) - rootCmd.AddCommand(newValidateSubCommand(set, flagSet)) + rootCmd.AddCommand(newValidateSubCommand(set, flagSet, enforceProviders)) rootCmd.Flags().AddGoFlagSet(flagSet) return rootCmd } // Puts command line flags from flags into the CollectorSettings, to be used during config resolution. -func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet) error { +func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet, enforceProviders bool) error { resolverSet := &set.ConfigProviderSettings.ResolverSettings configFlags := getConfigFlag(flags) @@ -56,6 +71,9 @@ func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet) error // TODO: Remove this after CollectorSettings.ConfigProvider is removed and instead // do it in the builder. if len(resolverSet.ProviderFactories) == 0 && len(resolverSet.ConverterFactories) == 0 { + if enforceProviders { + return errors.New("at least one Provider must be supplied") + } set.ConfigProviderSettings = newDefaultConfigProviderSettings(resolverSet.URIs) } return nil diff --git a/otelcol/command_components_test.go b/otelcol/command_components_test.go index d144d1dc32a..64f310886e9 100644 --- a/otelcol/command_components_test.go +++ b/otelcol/command_components_test.go @@ -22,7 +22,7 @@ func TestNewBuildSubCommand(t *testing.T) { Factories: nopFactories, ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), } - cmd := NewCommand(set) + cmd := NewCommandMustSetProvider(set) cmd.SetArgs([]string{"components"}) ExpectedOutput, err := os.ReadFile(filepath.Join("testdata", "components-output.yaml")) diff --git a/otelcol/command_test.go b/otelcol/command_test.go index 69e1a943d2b..0fb2ccfb668 100644 --- a/otelcol/command_test.go +++ b/otelcol/command_test.go @@ -19,19 +19,23 @@ import ( ) func TestNewCommandVersion(t *testing.T) { - cmd := NewCommand(CollectorSettings{BuildInfo: component.BuildInfo{Version: "test_version"}}) + cmd := NewCommandMustSetProvider(CollectorSettings{BuildInfo: component.BuildInfo{Version: "test_version"}}) assert.Equal(t, "test_version", cmd.Version) } func TestNewCommandNoConfigURI(t *testing.T) { - cmd := NewCommand(CollectorSettings{Factories: nopFactories}) + cmd := NewCommandMustSetProvider(CollectorSettings{Factories: nopFactories}) require.Error(t, cmd.Execute()) } // This test emulates usage of Collector in Jaeger all-in-one, which // allows running the binary with no explicit configuration. func TestNewCommandProgrammaticallyPassedConfig(t *testing.T) { - cmd := NewCommand(CollectorSettings{Factories: nopFactories}) + cmd := NewCommandMustSetProvider(CollectorSettings{Factories: nopFactories, ConfigProviderSettings: ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + ProviderFactories: []confmap.ProviderFactory{confmap.NewProviderFactory(newFailureProvider)}, + }, + }}) otelRunE := cmd.RunE cmd.RunE = func(c *cobra.Command, args []string) error { configFlag := c.Flag("config") @@ -62,7 +66,7 @@ func TestAddFlagToSettings(t *testing.T) { err := flgs.Parse([]string{"--config=otelcol-nop.yaml"}) require.NoError(t, err) - err = updateSettingsUsingFlags(&set, flgs) + err = updateSettingsUsingFlags(&set, flgs, false) require.NoError(t, err) require.Len(t, set.ConfigProviderSettings.ResolverSettings.URIs, 1) } @@ -77,7 +81,7 @@ func TestAddDefaultConfmapModules(t *testing.T) { err := flgs.Parse([]string{"--config=otelcol-nop.yaml"}) require.NoError(t, err) - err = updateSettingsUsingFlags(&set, flgs) + err = updateSettingsUsingFlags(&set, flgs, false) require.NoError(t, err) require.Len(t, set.ConfigProviderSettings.ResolverSettings.URIs, 1) require.Len(t, set.ConfigProviderSettings.ResolverSettings.ConverterFactories, 1) @@ -94,7 +98,7 @@ func TestInvalidCollectorSettings(t *testing.T) { }, } - cmd := NewCommand(set) + cmd := NewCommandMustSetProvider(set) require.Error(t, cmd.Execute()) } @@ -107,6 +111,22 @@ func TestNewCommandInvalidComponent(t *testing.T) { }, } - cmd := NewCommand(CollectorSettings{Factories: nopFactories, ConfigProviderSettings: set}) + cmd := NewCommandMustSetProvider(CollectorSettings{Factories: nopFactories, ConfigProviderSettings: set}) require.Error(t, cmd.Execute()) } + +func TestNoProvidersReturnsError(t *testing.T) { + set := CollectorSettings{ + ConfigProviderSettings: ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + URIs: []string{filepath.Join("testdata", "otelcol-invalid.yaml")}, + }, + }, + } + flgs := flags(featuregate.NewRegistry()) + err := flgs.Parse([]string{"--config=otelcol-nop.yaml"}) + require.NoError(t, err) + + err = updateSettingsUsingFlags(&set, flgs, true) + require.ErrorContains(t, err, "at least one Provider must be supplied") +} diff --git a/otelcol/command_validate.go b/otelcol/command_validate.go index 486bc50e716..d1c78ff2f8a 100644 --- a/otelcol/command_validate.go +++ b/otelcol/command_validate.go @@ -10,13 +10,13 @@ import ( ) // newValidateSubCommand constructs a new validate sub command using the given CollectorSettings. -func newValidateSubCommand(set CollectorSettings, flagSet *flag.FlagSet) *cobra.Command { +func newValidateSubCommand(set CollectorSettings, flagSet *flag.FlagSet, enforceProviders bool) *cobra.Command { validateCmd := &cobra.Command{ Use: "validate", Short: "Validates the config without running the collector", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, _ []string) error { - if err := updateSettingsUsingFlags(&set, flagSet); err != nil { + if err := updateSettingsUsingFlags(&set, flagSet, enforceProviders); err != nil { return err } col, err := NewCollector(set) diff --git a/otelcol/command_validate_test.go b/otelcol/command_validate_test.go index 4aa09d7ff13..a8d36eafa15 100644 --- a/otelcol/command_validate_test.go +++ b/otelcol/command_validate_test.go @@ -16,7 +16,7 @@ import ( ) func TestValidateSubCommandNoConfig(t *testing.T) { - cmd := newValidateSubCommand(CollectorSettings{Factories: nopFactories}, flags(featuregate.GlobalRegistry())) + cmd := newValidateSubCommand(CollectorSettings{Factories: nopFactories}, flags(featuregate.GlobalRegistry()), false) err := cmd.Execute() require.Error(t, err) require.Contains(t, err.Error(), "at least one config flag must be provided") @@ -29,7 +29,7 @@ func TestValidateSubCommandInvalidComponents(t *testing.T) { ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()}, ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, }, - }}, flags(featuregate.GlobalRegistry())) + }}, flags(featuregate.GlobalRegistry()), false) err := cmd.Execute() require.Error(t, err) require.Contains(t, err.Error(), "unknown type: \"nosuchprocessor\"") diff --git a/otelcol/otelcoltest/config.go b/otelcol/otelcoltest/config.go index 6191eb9dbec..2e1ec6688db 100644 --- a/otelcol/otelcoltest/config.go +++ b/otelcol/otelcoltest/config.go @@ -15,10 +15,21 @@ import ( "go.opentelemetry.io/collector/otelcol" ) +// LoadConfigWithSettings loads a config.Config from the provider settings, and does NOT validate the configuration. +func LoadConfigWithSettings(factories otelcol.Factories, set otelcol.ConfigProviderSettings) (*otelcol.Config, error) { + // Read yaml config from file + provider, err := otelcol.NewConfigProvider(set) + if err != nil { + return nil, err + } + return provider.Get(context.Background(), factories) +} + // LoadConfig loads a config.Config from file, and does NOT validate the configuration. +// +// Deprecated: [v0.103.0] use LoadConfigWithSettings instead func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config, error) { - // Read yaml config from file - provider, err := otelcol.NewConfigProvider(otelcol.ConfigProviderSettings{ + return LoadConfigWithSettings(factories, otelcol.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ URIs: []string{fileName}, ProviderFactories: []confmap.ProviderFactory{ @@ -30,15 +41,33 @@ func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config, ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, }, }) +} + +// LoadConfigAndValidateWithSettings loads a config from the provider settings, and validates the configuration. +func LoadConfigAndValidateWithSettings(factories otelcol.Factories, set otelcol.ConfigProviderSettings) (*otelcol.Config, error) { + cfg, err := LoadConfigWithSettings(factories, set) if err != nil { return nil, err } - return provider.Get(context.Background(), factories) + return cfg, cfg.Validate() } // LoadConfigAndValidate loads a config from the file, and validates the configuration. +// +// Deprecated: [v0.103.0] Use LoadConfigAndValidateWithSettings instead func LoadConfigAndValidate(fileName string, factories otelcol.Factories) (*otelcol.Config, error) { - cfg, err := LoadConfig(fileName, factories) + cfg, err := LoadConfigWithSettings(factories, otelcol.ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + URIs: []string{fileName}, + ProviderFactories: []confmap.ProviderFactory{ + fileprovider.NewFactory(), + envprovider.NewFactory(), + yamlprovider.NewFactory(), + httpprovider.NewFactory(), + }, + ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, + }, + }) if err != nil { return nil, err } diff --git a/otelcol/otelcoltest/config_test.go b/otelcol/otelcoltest/config_test.go index 71502de536e..c9b0eef14f6 100644 --- a/otelcol/otelcoltest/config_test.go +++ b/otelcol/otelcoltest/config_test.go @@ -11,6 +11,13 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/converter/expandconverter" + "go.opentelemetry.io/collector/confmap/provider/envprovider" + "go.opentelemetry.io/collector/confmap/provider/fileprovider" + "go.opentelemetry.io/collector/confmap/provider/httpprovider" + "go.opentelemetry.io/collector/confmap/provider/yamlprovider" + "go.opentelemetry.io/collector/otelcol" "go.opentelemetry.io/collector/service/pipelines" ) @@ -18,7 +25,18 @@ func TestLoadConfig(t *testing.T) { factories, err := NopFactories() assert.NoError(t, err) - cfg, err := LoadConfig(filepath.Join("testdata", "config.yaml"), factories) + cfg, err := LoadConfigWithSettings(factories, otelcol.ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + URIs: []string{filepath.Join("testdata", "config.yaml")}, + ProviderFactories: []confmap.ProviderFactory{ + fileprovider.NewFactory(), + envprovider.NewFactory(), + yamlprovider.NewFactory(), + httpprovider.NewFactory(), + }, + ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, + }, + }) require.NoError(t, err) // Verify extensions. @@ -63,10 +81,23 @@ func TestLoadConfigAndValidate(t *testing.T) { factories, err := NopFactories() assert.NoError(t, err) - cfgValidate, errValidate := LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) + set := otelcol.ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + URIs: []string{filepath.Join("testdata", "config.yaml")}, + ProviderFactories: []confmap.ProviderFactory{ + fileprovider.NewFactory(), + envprovider.NewFactory(), + yamlprovider.NewFactory(), + httpprovider.NewFactory(), + }, + ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, + }, + } + + cfgValidate, errValidate := LoadConfigAndValidateWithSettings(factories, set) require.NoError(t, errValidate) - cfg, errLoad := LoadConfig(filepath.Join("testdata", "config.yaml"), factories) + cfg, errLoad := LoadConfigWithSettings(factories, set) require.NoError(t, errLoad) assert.Equal(t, cfg, cfgValidate) From f4b0be3a523c5b0efd7bfb0a0238f8aff5e14a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Wed, 12 Jun 2024 18:50:14 +0200 Subject: [PATCH 067/168] [pdata] Change mode for generated files (#10395) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This came up during the security review, but this shouldn't have any practical effect other than removing a nosec directive, given that git will store the files in 0644 mode anyway. This is what the security audit references as "OTE-01-005 WP1". Signed-off-by: Juraci Paixão Kröhling Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- pdata/internal/cmd/pdatagen/internal/packages.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pdata/internal/cmd/pdatagen/internal/packages.go b/pdata/internal/cmd/pdatagen/internal/packages.go index 340912dbc01..13d98d6703c 100644 --- a/pdata/internal/cmd/pdatagen/internal/packages.go +++ b/pdata/internal/cmd/pdatagen/internal/packages.go @@ -64,9 +64,7 @@ func (p *Package) GenerateFiles() error { sb.WriteString(newLine) path := filepath.Join("pdata", p.path, "generated_"+strings.ToLower(s.getName())+".go") - // ignore gosec complain about permissions being `0644`. - //nolint:gosec - if err := os.WriteFile(path, sb.Bytes(), 0644); err != nil { + if err := os.WriteFile(path, sb.Bytes(), 0600); err != nil { return err } } @@ -99,9 +97,7 @@ func (p *Package) GenerateTestFiles() error { } path := filepath.Join("pdata", p.path, "generated_"+strings.ToLower(s.getName())+"_test.go") - // ignore gosec complain about permissions being `0644`. - //nolint:gosec - if err := os.WriteFile(path, sb.Bytes(), 0644); err != nil { + if err := os.WriteFile(path, sb.Bytes(), 0600); err != nil { return err } } @@ -142,9 +138,7 @@ func (p *Package) GenerateInternalFiles() error { sb.WriteString(newLine) path := filepath.Join("pdata", "internal", "generated_wrapper_"+strings.ToLower(s.getName())+".go") - // ignore gosec complain about permissions being `0644`. - //nolint:gosec - if err := os.WriteFile(path, sb.Bytes(), 0644); err != nil { + if err := os.WriteFile(path, sb.Bytes(), 0600); err != nil { return err } } From 422eaf2a9f54d3b70d5308130413c8669e0502e6 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 12 Jun 2024 17:01:55 +0000 Subject: [PATCH 068/168] [chore] Changing error output is not a breaking change (#10396) --- VERSIONING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSIONING.md b/VERSIONING.md index e0dcc6781b5..43e4f65bce4 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -26,8 +26,8 @@ OpenTelemetry authors reserve the right to introduce API changes breaking compat `import .` with OpenTelemetry Collector modules. Unless otherwise specified in the documentation, the following may change in any way between minor versions: -* **String representation**. The `String` method of any struct is intended to be human-readable and may change its output - in any way. +* **String representation**. The `String` or `Error` method of any struct is intended to be human-readable and may + change its output in any way. * **Go version compatibility**. Removing support for an unsupported Go version is not considered a breaking change. * **OS version compatibility**. Removing support for an unsupported OS version is not considered a breaking change. Upgrading or downgrading OS version support per the [platform support](docs/platform-support.md) document is not considered a breaking change. * **Dependency updates**. Updating dependencies is not considered a breaking change except when their types are part of the From 4e1c2150b579dd0584331d1ff46e2d4e67ae5efa Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 12 Jun 2024 18:11:29 +0100 Subject: [PATCH 069/168] [exporterhelper] Fix small batch due to scheduling in batch sender (#10337) #### Description - Correctly keep track of bs.activeRequests, which denotes the number of send waiting for next sender in chain to return. This is already done before this PR, but in a way that is vulnerable to unfavorable goroutine scheduling - Decrease bs.activeRequests by the number of requests blocked by an activeBatch at once, so that it workarounds the "bug" mentioned in (1). #### Link to tracking issue Fixes #9952 --------- Co-authored-by: Dmitrii Anoshin --- .chloggen/fix_batch_sender_small_batch.yaml | 20 ++++ exporter/exporterhelper/batch_sender.go | 24 +++- exporter/exporterhelper/batch_sender_test.go | 112 +++++++++++++++---- exporter/exporterhelper/common.go | 2 +- 4 files changed, 132 insertions(+), 26 deletions(-) create mode 100644 .chloggen/fix_batch_sender_small_batch.yaml diff --git a/.chloggen/fix_batch_sender_small_batch.yaml b/.chloggen/fix_batch_sender_small_batch.yaml new file mode 100644 index 00000000000..fedb8f3a867 --- /dev/null +++ b/.chloggen/fix_batch_sender_small_batch.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix small batch due to unfavorable goroutine scheduling in batch sender + +# One or more tracking issues or pull requests related to the change +issues: [9952] + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/exporterhelper/batch_sender.go b/exporter/exporterhelper/batch_sender.go index a1c8bc6903c..4d9635195e2 100644 --- a/exporter/exporterhelper/batch_sender.go +++ b/exporter/exporterhelper/batch_sender.go @@ -30,8 +30,8 @@ type batchSender struct { // concurrencyLimit is the maximum number of goroutines that can be blocked by the batcher. // If this number is reached and all the goroutines are busy, the batch will be sent right away. // Populated from the number of queue consumers if queue is enabled. - concurrencyLimit uint64 - activeRequests atomic.Uint64 + concurrencyLimit int64 + activeRequests atomic.Int64 mu sync.Mutex activeBatch *batch @@ -106,6 +106,10 @@ type batch struct { request Request done chan struct{} err error + + // requestsBlocked is the number of requests blocked in this batch + // that can be immediately released from activeRequests when batch sending completes. + requestsBlocked int64 } func newEmptyBatch() *batch { @@ -121,6 +125,7 @@ func (bs *batchSender) exportActiveBatch() { go func(b *batch) { b.err = bs.nextSender.send(b.ctx, b.request) close(b.done) + bs.activeRequests.Add(-b.requestsBlocked) }(bs.activeBatch) bs.lastFlushed = time.Now() bs.activeBatch = newEmptyBatch() @@ -149,14 +154,20 @@ func (bs *batchSender) send(ctx context.Context, req Request) error { // sendMergeSplitBatch sends the request to the batch which may be split into multiple requests. func (bs *batchSender) sendMergeSplitBatch(ctx context.Context, req Request) error { bs.mu.Lock() - bs.activeRequests.Add(1) - defer bs.activeRequests.Add(^uint64(0)) reqs, err := bs.mergeSplitFunc(ctx, bs.cfg.MaxSizeConfig, bs.activeBatch.request, req) if err != nil || len(reqs) == 0 { bs.mu.Unlock() return err } + + bs.activeRequests.Add(1) + if len(reqs) == 1 { + bs.activeBatch.requestsBlocked++ + } else { + // if there was a split, we want to make sure that bs.activeRequests is released once all of the parts are sent instead of using batch.requestsBlocked + defer bs.activeRequests.Add(-1) + } if len(reqs) == 1 || bs.activeBatch.request != nil { bs.updateActiveBatch(ctx, reqs[0]) batch := bs.activeBatch @@ -186,8 +197,6 @@ func (bs *batchSender) sendMergeSplitBatch(ctx context.Context, req Request) err // sendMergeBatch sends the request to the batch and waits for the batch to be exported. func (bs *batchSender) sendMergeBatch(ctx context.Context, req Request) error { bs.mu.Lock() - bs.activeRequests.Add(1) - defer bs.activeRequests.Add(^uint64(0)) if bs.activeBatch.request != nil { var err error @@ -197,8 +206,11 @@ func (bs *batchSender) sendMergeBatch(ctx context.Context, req Request) error { return err } } + + bs.activeRequests.Add(1) bs.updateActiveBatch(ctx, req) batch := bs.activeBatch + batch.requestsBlocked++ if bs.isActiveBatchReady() { bs.exportActiveBatch() } diff --git a/exporter/exporterhelper/batch_sender_test.go b/exporter/exporterhelper/batch_sender_test.go index 5a5a175bdab..4651e9c6182 100644 --- a/exporter/exporterhelper/batch_sender_test.go +++ b/exporter/exporterhelper/batch_sender_test.go @@ -136,7 +136,7 @@ func TestBatchSender_BatchExportError(t *testing.T) { assert.Eventually(t, func() bool { return sink.requestsCount.Load() == tt.expectedRequests && sink.itemsCount.Load() == tt.expectedItems && - be.batchSender.(*batchSender).activeRequests.Load() == uint64(0) && + be.batchSender.(*batchSender).activeRequests.Load() == 0 && be.queueSender.(*queueSender).queue.Size() == 0 }, 100*time.Millisecond, 10*time.Millisecond) }) @@ -270,27 +270,101 @@ func TestBatchSender_PostShutdown(t *testing.T) { } func TestBatchSender_ConcurrencyLimitReached(t *testing.T) { - qCfg := exporterqueue.NewDefaultConfig() - qCfg.NumConsumers = 2 - be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, - WithBatcher(exporterbatcher.NewDefaultConfig(), WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc)), - WithRequestQueue(qCfg, exporterqueue.NewMemoryQueueFactory[Request]())) - require.NotNil(t, be) - require.NoError(t, err) - assert.NoError(t, be.Start(context.Background(), componenttest.NewNopHost())) - t.Cleanup(func() { - assert.NoError(t, be.Shutdown(context.Background())) - }) - sink := newFakeRequestSink() - assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 8, sink: sink})) + tests := []struct { + name string + batcherCfg exporterbatcher.Config + expectedRequests uint64 + expectedItems uint64 + }{ + { + name: "merge_only", + batcherCfg: func() exporterbatcher.Config { + cfg := exporterbatcher.NewDefaultConfig() + cfg.FlushTimeout = 20 * time.Millisecond + return cfg + }(), + expectedRequests: 6, + expectedItems: 51, + }, + { + name: "merge_without_split_triggered", + batcherCfg: func() exporterbatcher.Config { + cfg := exporterbatcher.NewDefaultConfig() + cfg.FlushTimeout = 20 * time.Millisecond + cfg.MaxSizeItems = 200 + return cfg + }(), + expectedRequests: 6, + expectedItems: 51, + }, + { + name: "merge_with_split_triggered", + batcherCfg: func() exporterbatcher.Config { + cfg := exporterbatcher.NewDefaultConfig() + cfg.FlushTimeout = 50 * time.Millisecond + cfg.MaxSizeItems = 10 + return cfg + }(), + expectedRequests: 8, + expectedItems: 51, + }, + } + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + qCfg := exporterqueue.NewDefaultConfig() + qCfg.NumConsumers = 2 + be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, + WithBatcher(tt.batcherCfg, WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc)), + WithRequestQueue(qCfg, exporterqueue.NewMemoryQueueFactory[Request]())) + require.NotNil(t, be) + require.NoError(t, err) + assert.NoError(t, be.Start(context.Background(), componenttest.NewNopHost())) + t.Cleanup(func() { + assert.NoError(t, be.Shutdown(context.Background())) + }) + + sink := newFakeRequestSink() + // the 1st and 2nd request should be flushed in the same batched request by max concurrency limit. + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 2, sink: sink})) + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 2, sink: sink})) - // the second request should be sent by reaching max concurrency limit. - assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 8, sink: sink})) + assert.Eventually(t, func() bool { + return sink.requestsCount.Load() == 1 && sink.itemsCount.Load() == 4 + }, 100*time.Millisecond, 10*time.Millisecond) - assert.Eventually(t, func() bool { - return sink.requestsCount.Load() == 1 && sink.itemsCount.Load() == 16 - }, 100*time.Millisecond, 10*time.Millisecond) + // the 3rd request should be flushed by itself due to flush interval + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 2, sink: sink})) + assert.Eventually(t, func() bool { + return sink.requestsCount.Load() == 2 && sink.itemsCount.Load() == 6 + }, 100*time.Millisecond, 10*time.Millisecond) + + // the 4th and 5th request should be flushed in the same batched request by max concurrency limit. + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 2, sink: sink})) + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 2, sink: sink})) + assert.Eventually(t, func() bool { + return sink.requestsCount.Load() == 3 && sink.itemsCount.Load() == 10 + }, 100*time.Millisecond, 10*time.Millisecond) + + // do it a few more times to ensure it produces the correct batch size regardless of goroutine scheduling. + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 5, sink: sink})) + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 6, sink: sink})) + if tt.batcherCfg.MaxSizeItems == 10 { + // in case of MaxSizeItems=10, wait for the leftover request to send + assert.Eventually(t, func() bool { + return sink.requestsCount.Load() == 5 && sink.itemsCount.Load() == 21 + }, 50*time.Millisecond, 10*time.Millisecond) + } + + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 6, sink: sink})) + assert.NoError(t, be.send(context.Background(), &fakeRequest{items: 20, sink: sink})) + assert.Eventually(t, func() bool { + return sink.requestsCount.Load() == tt.expectedRequests && sink.itemsCount.Load() == tt.expectedItems + }, 100*time.Millisecond, 10*time.Millisecond) + }) + } } func TestBatchSender_BatchBlocking(t *testing.T) { diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index 4ed1dd3cb39..4016c14e7c9 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -280,7 +280,7 @@ func newBaseExporter(set exporter.Settings, signal component.DataType, osf obsre if bs, ok := be.batchSender.(*batchSender); ok { // If queue sender is enabled assign to the batch sender the same number of workers. if qs, ok := be.queueSender.(*queueSender); ok { - bs.concurrencyLimit = uint64(qs.numConsumers) + bs.concurrencyLimit = int64(qs.numConsumers) } // Batcher sender mutates the data. be.consumerOptions = append(be.consumerOptions, consumer.WithCapabilities(consumer.Capabilities{MutatesData: true})) From 1889d589d5933623b4a4a1831379e95ca02225fb Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Wed, 12 Jun 2024 14:35:52 -0700 Subject: [PATCH 070/168] [extension/zpages] zpagesextension using confighttp.ServerConfig (#10276) #### Description use confighttp.ServerConfig as part of the configuration of the zpagesextension #### Link to tracking issue Fixes #9368 --- .../zpagesextension_confighttp-user.yaml | 25 ++++++++++++ .chloggen/zpagesextension_confighttp.yaml | 25 ++++++++++++ extension/zpagesextension/config.go | 9 ++--- extension/zpagesextension/config_test.go | 8 +++- extension/zpagesextension/factory.go | 4 +- extension/zpagesextension/factory_test.go | 6 +-- extension/zpagesextension/go.mod | 38 ++++++++++++++++--- extension/zpagesextension/go.sum | 32 +++++++++++++--- extension/zpagesextension/zpagesextension.go | 15 ++++++-- .../zpagesextension/zpagesextension_test.go | 28 ++++++++++---- otelcol/go.mod | 20 ++++++++-- otelcol/go.sum | 20 ++++++++-- service/go.mod | 34 ++++++++++++++--- service/go.sum | 20 ++++++++-- service/service_test.go | 4 +- 15 files changed, 233 insertions(+), 55 deletions(-) create mode 100644 .chloggen/zpagesextension_confighttp-user.yaml create mode 100644 .chloggen/zpagesextension_confighttp.yaml diff --git a/.chloggen/zpagesextension_confighttp-user.yaml b/.chloggen/zpagesextension_confighttp-user.yaml new file mode 100644 index 00000000000..3c5efdfaa94 --- /dev/null +++ b/.chloggen/zpagesextension_confighttp-user.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confighttp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Use `confighttp.ServerConfig` as part of zpagesextension. See [https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/confighttp/README.md#server-configuration](server configuration) options. + +# One or more tracking issues or pull requests related to the change +issues: [9368] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/.chloggen/zpagesextension_confighttp.yaml b/.chloggen/zpagesextension_confighttp.yaml new file mode 100644 index 00000000000..c8664877eb6 --- /dev/null +++ b/.chloggen/zpagesextension_confighttp.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confighttp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Use `confighttp.ServerConfig` as part of zpagesextension.Config. Previously the extension used `confignet.TCPAddrConfig` + +# One or more tracking issues or pull requests related to the change +issues: [9368] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/extension/zpagesextension/config.go b/extension/zpagesextension/config.go index 6702491ad0d..7375f225ff8 100644 --- a/extension/zpagesextension/config.go +++ b/extension/zpagesextension/config.go @@ -7,22 +7,19 @@ import ( "errors" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/config/confighttp" ) // Config has the configuration for the extension enabling the zPages extension. type Config struct { - // TCPAddr is the address and port in which the zPages will be listening to. - // Use localhost: to make it available only locally, or ":" to - // make it available on all network interfaces. - TCPAddr confignet.TCPAddrConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` } var _ component.Config = (*Config)(nil) // Validate checks if the extension configuration is valid func (cfg *Config) Validate() error { - if cfg.TCPAddr.Endpoint == "" { + if cfg.ServerConfig.Endpoint == "" { return errors.New("\"endpoint\" is required when using the \"zpages\" extension") } return nil diff --git a/extension/zpagesextension/config_test.go b/extension/zpagesextension/config_test.go index f73b9744b0e..dd608aecbb3 100644 --- a/extension/zpagesextension/config_test.go +++ b/extension/zpagesextension/config_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -22,6 +22,10 @@ func TestUnmarshalDefaultConfig(t *testing.T) { assert.Equal(t, factory.CreateDefaultConfig(), cfg) } +func TestInvalidConfig(t *testing.T) { + assert.Error(t, (&Config{}).Validate()) +} + func TestUnmarshalConfig(t *testing.T) { cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) require.NoError(t, err) @@ -30,7 +34,7 @@ func TestUnmarshalConfig(t *testing.T) { assert.NoError(t, cm.Unmarshal(&cfg)) assert.Equal(t, &Config{ - TCPAddr: confignet.TCPAddrConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:56888", }, }, cfg) diff --git a/extension/zpagesextension/factory.go b/extension/zpagesextension/factory.go index dd6dda58645..b307de1821c 100644 --- a/extension/zpagesextension/factory.go +++ b/extension/zpagesextension/factory.go @@ -7,7 +7,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/zpagesextension/internal/metadata" ) @@ -23,7 +23,7 @@ func NewFactory() extension.Factory { func createDefaultConfig() component.Config { return &Config{ - TCPAddr: confignet.TCPAddrConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: defaultEndpoint, }, } diff --git a/extension/zpagesextension/factory_test.go b/extension/zpagesextension/factory_test.go index ba36df32175..d4e66830ad1 100644 --- a/extension/zpagesextension/factory_test.go +++ b/extension/zpagesextension/factory_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/extension/extensiontest" "go.opentelemetry.io/collector/internal/testutil" ) @@ -19,7 +19,7 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - TCPAddr: confignet.TCPAddrConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:55679", }, }, @@ -33,7 +33,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { func TestFactory_CreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) - cfg.TCPAddr.Endpoint = testutil.GetAvailableLocalAddress(t) + cfg.ServerConfig.Endpoint = testutil.GetAvailableLocalAddress(t) ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg) require.NoError(t, err) diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index e0888a4d847..c134280c0aa 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -6,7 +6,8 @@ require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.102.1 go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/confignet v0.102.1 + go.opentelemetry.io/collector/config/configauth v0.102.1 + go.opentelemetry.io/collector/config/confighttp v0.102.1 go.opentelemetry.io/collector/confmap v0.102.1 go.opentelemetry.io/collector/extension v0.102.1 go.opentelemetry.io/contrib/zpages v0.52.0 @@ -21,12 +22,17 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect + github.com/klauspost/compress v1.17.8 // indirect 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.1.1 // indirect @@ -37,9 +43,17 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect + github.com/rs/cors v1.10.1 // indirect + go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtls v0.102.1 // indirect + go.opentelemetry.io/collector/config/internal v0.102.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect @@ -53,9 +67,9 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect @@ -67,8 +81,6 @@ replace go.opentelemetry.io/collector => ../../ replace go.opentelemetry.io/collector/component => ../../component -replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet - replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/extension => ../ @@ -87,3 +99,17 @@ retract ( replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata + +replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque + +replace go.opentelemetry.io/collector/config/internal => ../../config/internal + +replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + +replace go.opentelemetry.io/collector/config/configauth => ../../config/configauth + +replace go.opentelemetry.io/collector/extension/auth => ../auth + +replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index ae3ffab16e5..ddebac0891e 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -6,6 +6,10 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 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/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -15,14 +19,22 @@ github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsM github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= @@ -37,6 +49,10 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= @@ -49,12 +65,16 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= @@ -100,20 +120,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/extension/zpagesextension/zpagesextension.go b/extension/zpagesextension/zpagesextension.go index 5e331966b01..16bb6c6635d 100644 --- a/extension/zpagesextension/zpagesextension.go +++ b/extension/zpagesextension/zpagesextension.go @@ -24,7 +24,7 @@ type zpagesExtension struct { config *Config telemetry component.TelemetrySettings zpagesSpanProcessor *zpages.SpanProcessor - server http.Server + server *http.Server stopCh chan struct{} } @@ -43,7 +43,8 @@ type registerableTracerProvider interface { UnregisterSpanProcessor(SpanProcessor trace.SpanProcessor) } -func (zpe *zpagesExtension) Start(_ context.Context, host component.Host) error { +func (zpe *zpagesExtension) Start(ctx context.Context, host component.Host) error { + zPagesMux := http.NewServeMux() sdktracer, ok := zpe.telemetry.TracerProvider.(registerableTracerProvider) @@ -67,13 +68,16 @@ func (zpe *zpagesExtension) Start(_ context.Context, host component.Host) error // Start the listener here so we can have earlier failure if port is // already in use. - ln, err := zpe.config.TCPAddr.Listen(context.Background()) + ln, err := zpe.config.ToListener(ctx) if err != nil { return err } zpe.telemetry.Logger.Info("Starting zPages extension", zap.Any("config", zpe.config)) - zpe.server = http.Server{Handler: zPagesMux} + zpe.server, err = zpe.config.ToServer(ctx, host, zpe.telemetry, zPagesMux) + if err != nil { + return err + } zpe.stopCh = make(chan struct{}) go func() { defer close(zpe.stopCh) @@ -87,6 +91,9 @@ func (zpe *zpagesExtension) Start(_ context.Context, host component.Host) error } func (zpe *zpagesExtension) Shutdown(context.Context) error { + if zpe.server == nil { + return nil + } err := zpe.server.Close() if zpe.stopCh != nil { <-zpe.stopCh diff --git a/extension/zpagesextension/zpagesextension_test.go b/extension/zpagesextension/zpagesextension_test.go index 462ca58cf07..60bbc1b61db 100644 --- a/extension/zpagesextension/zpagesextension_test.go +++ b/extension/zpagesextension/zpagesextension_test.go @@ -16,7 +16,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/internal/testutil" ) @@ -48,7 +49,7 @@ func newZpagesTelemetrySettings() component.TelemetrySettings { func TestZPagesExtensionUsage(t *testing.T) { cfg := &Config{ - TCPAddr: confignet.TCPAddrConfig{ + confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, } @@ -62,7 +63,7 @@ func TestZPagesExtensionUsage(t *testing.T) { // Give a chance for the server goroutine to run. runtime.Gosched() - _, zpagesPort, err := net.SplitHostPort(cfg.TCPAddr.Endpoint) + _, zpagesPort, err := net.SplitHostPort(cfg.ServerConfig.Endpoint) require.NoError(t, err) client := &http.Client{} @@ -73,6 +74,19 @@ func TestZPagesExtensionUsage(t *testing.T) { require.Equal(t, http.StatusOK, resp.StatusCode) } +func TestZPagesExtensionBadAuthExtension(t *testing.T) { + cfg := &Config{ + confighttp.ServerConfig{ + Endpoint: "localhost:0", + Auth: &configauth.Authentication{ + AuthenticatorID: component.MustNewIDWithName("foo", "bar"), + }, + }, + } + zpagesExt := newServer(cfg, newZpagesTelemetrySettings()) + require.EqualError(t, zpagesExt.Start(context.Background(), componenttest.NewNopHost()), `failed to resolve authenticator "foo/bar": authenticator not found`) +} + func TestZPagesExtensionPortAlreadyInUse(t *testing.T) { endpoint := testutil.GetAvailableLocalAddress(t) ln, err := net.Listen("tcp", endpoint) @@ -80,7 +94,7 @@ func TestZPagesExtensionPortAlreadyInUse(t *testing.T) { defer ln.Close() cfg := &Config{ - TCPAddr: confignet.TCPAddrConfig{ + confighttp.ServerConfig{ Endpoint: endpoint, }, } @@ -92,7 +106,7 @@ func TestZPagesExtensionPortAlreadyInUse(t *testing.T) { func TestZPagesMultipleStarts(t *testing.T) { cfg := &Config{ - TCPAddr: confignet.TCPAddrConfig{ + confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, } @@ -109,7 +123,7 @@ func TestZPagesMultipleStarts(t *testing.T) { func TestZPagesMultipleShutdowns(t *testing.T) { cfg := &Config{ - TCPAddr: confignet.TCPAddrConfig{ + confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, } @@ -124,7 +138,7 @@ func TestZPagesMultipleShutdowns(t *testing.T) { func TestZPagesShutdownWithoutStart(t *testing.T) { cfg := &Config{ - TCPAddr: confignet.TCPAddrConfig{ + confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, } diff --git a/otelcol/go.mod b/otelcol/go.mod index ad300862725..2b39453df65 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -89,8 +89,8 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect @@ -141,6 +141,18 @@ replace go.opentelemetry.io/collector/receiver => ../receiver replace go.opentelemetry.io/collector/featuregate => ../featuregate -replace go.opentelemetry.io/collector/config/confignet => ../config/confignet - replace go.opentelemetry.io/collector/config/configretry => ../config/configretry + +replace go.opentelemetry.io/collector/config/confighttp => ../config/confighttp + +replace go.opentelemetry.io/collector/config/internal => ../config/internal + +replace go.opentelemetry.io/collector/config/configauth => ../config/configauth + +replace go.opentelemetry.io/collector/extension/auth => ../extension/auth + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression + +replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque diff --git a/otelcol/go.sum b/otelcol/go.sum index 280b516b6dc..d78b15cb72b 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -17,6 +17,10 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -42,6 +46,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -65,6 +71,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= @@ -101,6 +109,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= @@ -133,6 +143,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= @@ -193,8 +205,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -213,8 +225,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/service/go.mod b/service/go.mod index b5b5f8517c8..2499e36c0a5 100644 --- a/service/go.mod +++ b/service/go.mod @@ -12,7 +12,7 @@ require ( go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.102.1 go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/confignet v0.102.1 + go.opentelemetry.io/collector/config/confighttp v0.102.1 go.opentelemetry.io/collector/config/configtelemetry v0.102.1 go.opentelemetry.io/collector/confmap v0.102.1 go.opentelemetry.io/collector/connector v0.102.1 @@ -49,15 +49,19 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.17.8 // indirect 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.1.1 // indirect @@ -69,19 +73,27 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/procfs v0.15.0 // indirect + github.com/rs/cors v1.10.1 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect + go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.102.1 // indirect + go.opentelemetry.io/collector/config/internal v0.102.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect @@ -119,6 +131,18 @@ replace go.opentelemetry.io/collector/receiver => ../receiver replace go.opentelemetry.io/collector/featuregate => ../featuregate -replace go.opentelemetry.io/collector/config/confignet => ../config/confignet - replace go.opentelemetry.io/collector/config/configretry => ../config/configretry + +replace go.opentelemetry.io/collector/extension/auth => ../extension/auth + +replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque + +replace go.opentelemetry.io/collector/config/confighttp => ../config/confighttp + +replace go.opentelemetry.io/collector/config/configauth => ../config/configauth + +replace go.opentelemetry.io/collector/config/internal => ../config/internal + +replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression diff --git a/service/go.sum b/service/go.sum index 06ff3b65946..516e5e848a1 100644 --- a/service/go.sum +++ b/service/go.sum @@ -16,6 +16,10 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -41,6 +45,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -62,6 +68,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= @@ -98,6 +106,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -125,6 +135,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= @@ -185,8 +197,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -205,8 +217,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/service/service_test.go b/service/service_test.go index f708a82fb0d..b7faad7a737 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -20,7 +20,7 @@ import ( "go.uber.org/zap/zapcore" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/connector/connectortest" @@ -275,7 +275,7 @@ func testCollectorStartHelper(t *testing.T, tc ownMetricsTestCase) { set := newNopSettings() set.BuildInfo = component.BuildInfo{Version: "test version", Command: otelCommand} set.Extensions = extension.NewBuilder( - map[component.ID]component.Config{component.MustNewID("zpages"): &zpagesextension.Config{TCPAddr: confignet.TCPAddrConfig{Endpoint: zpagesAddr}}}, + map[component.ID]component.Config{component.MustNewID("zpages"): &zpagesextension.Config{ServerConfig: confighttp.ServerConfig{Endpoint: zpagesAddr}}}, map[component.Type]extension.Factory{component.MustNewType("zpages"): zpagesextension.NewFactory()}) set.LoggingOptions = []zap.Option{zap.Hooks(hook)} From 662a4c4520b68e32649800f9b92fec9c1fe25f28 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 13 Jun 2024 04:52:56 -0700 Subject: [PATCH 071/168] [chore] update code to use WithoutCancel (#10397) This was introduced in go 1.21 and removes the need for a custom implementation of the context. Fixes #9049 Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- exporter/exporterhelper/obsexporter.go | 6 +++--- exporter/exporterhelper/queue_sender.go | 19 +------------------ exporter/exporterhelper/queue_sender_test.go | 2 +- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/exporter/exporterhelper/obsexporter.go b/exporter/exporterhelper/obsexporter.go index 8093bd1f834..1e4d1179f4d 100644 --- a/exporter/exporterhelper/obsexporter.go +++ b/exporter/exporterhelper/obsexporter.go @@ -69,7 +69,7 @@ func (or *ObsReport) StartTracesOp(ctx context.Context) context.Context { // EndTracesOp completes the export operation that was started with StartTracesOp. func (or *ObsReport) EndTracesOp(ctx context.Context, numSpans int, err error) { numSent, numFailedToSend := toNumItems(numSpans, err) - or.recordMetrics(noCancellationContext{Context: ctx}, component.DataTypeTraces, numSent, numFailedToSend) + or.recordMetrics(context.WithoutCancel(ctx), component.DataTypeTraces, numSent, numFailedToSend) endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentSpansKey, obsmetrics.FailedToSendSpansKey) } @@ -84,7 +84,7 @@ func (or *ObsReport) StartMetricsOp(ctx context.Context) context.Context { // StartMetricsOp. func (or *ObsReport) EndMetricsOp(ctx context.Context, numMetricPoints int, err error) { numSent, numFailedToSend := toNumItems(numMetricPoints, err) - or.recordMetrics(noCancellationContext{Context: ctx}, component.DataTypeMetrics, numSent, numFailedToSend) + or.recordMetrics(context.WithoutCancel(ctx), component.DataTypeMetrics, numSent, numFailedToSend) endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentMetricPointsKey, obsmetrics.FailedToSendMetricPointsKey) } @@ -98,7 +98,7 @@ func (or *ObsReport) StartLogsOp(ctx context.Context) context.Context { // EndLogsOp completes the export operation that was started with StartLogsOp. func (or *ObsReport) EndLogsOp(ctx context.Context, numLogRecords int, err error) { numSent, numFailedToSend := toNumItems(numLogRecords, err) - or.recordMetrics(noCancellationContext{Context: ctx}, component.DataTypeLogs, numSent, numFailedToSend) + or.recordMetrics(context.WithoutCancel(ctx), component.DataTypeLogs, numSent, numFailedToSend) endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentLogRecordsKey, obsmetrics.FailedToSendLogRecordsKey) } diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index dbbf71f7bc5..f7817128b39 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -6,7 +6,6 @@ package exporterhelper // import "go.opentelemetry.io/collector/exporter/exporte import ( "context" "errors" - "time" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" @@ -120,7 +119,7 @@ func (qs *queueSender) Shutdown(ctx context.Context) error { func (qs *queueSender) send(ctx context.Context, req Request) error { // Prevent cancellation and deadline to propagate to the context stored in the queue. // The grpc/http based receivers will cancel the request context after this function returns. - c := noCancellationContext{Context: ctx} + c := context.WithoutCancel(ctx) span := trace.SpanFromContext(c) if err := qs.queue.Offer(c, req); err != nil { @@ -131,19 +130,3 @@ func (qs *queueSender) send(ctx context.Context, req Request) error { span.AddEvent("Enqueued item.", trace.WithAttributes(qs.traceAttribute)) return nil } - -type noCancellationContext struct { - context.Context -} - -func (noCancellationContext) Deadline() (deadline time.Time, ok bool) { - return -} - -func (noCancellationContext) Done() <-chan struct{} { - return nil -} - -func (noCancellationContext) Err() error { - return nil -} diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index c76b136a4e4..0cb344ddc67 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -235,7 +235,7 @@ func TestNoCancellationContext(t *testing.T) { require.True(t, ok) require.Equal(t, deadline, d) - nctx := noCancellationContext{Context: ctx} + nctx := context.WithoutCancel(ctx) assert.NoError(t, nctx.Err()) d, ok = nctx.Deadline() assert.False(t, ok) From 05bcfc02cfd1e03bb8c3f2d77a530cade4c37450 Mon Sep 17 00:00:00 2001 From: Adrian Cole <64215+codefromthecrypt@users.noreply.github.com> Date: Thu, 13 Jun 2024 20:11:38 +0800 Subject: [PATCH 072/168] [chore] link release managers (#10398) #### Description In normal github issues etc, if you `@user`, it makes a link for you. So, it feels weird to see `@user` without a link. Feel free to reject this if it is a cure worse than the disease. --- docs/release.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/release.md b/docs/release.md index a38338c506b..04fae1dcd9f 100644 --- a/docs/release.md +++ b/docs/release.md @@ -156,15 +156,15 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR ## Release schedule -| Date | Version | Release manager | -|------------|----------|-----------------| -| 2024-06-17 | v0.103.0 | @djaglowski | -| 2024-07-01 | v0.104.0 | @atoulme | -| 2024-07-15 | v0.105.0 | @TylerHelmuth | -| 2024-07-29 | v0.106.0 | @songy23 | -| 2024-08-12 | v0.107.0 | @dmitryax | -| 2024-08-26 | v0.108.0 | @codeboten | -| 2024-09-09 | v0.109.0 | @bogdandrutu | -| 2024-09-23 | v0.110.0 | @jpkrohling | -| 2024-10-07 | v0.111.0 | @mx-psi | -| 2024-10-21 | v0.112.0 | @evan-bradley | +| Date | Version | Release manager | +|------------|----------|--------------------------------------------------| +| 2024-06-17 | v0.103.0 | [@djaglowski](https://github.com/djaglowski) | +| 2024-07-01 | v0.104.0 | [@atoulme](https://github.com/atoulme) | +| 2024-07-15 | v0.105.0 | [@TylerHelmuth](https://github.com/TylerHelmuth) | +| 2024-07-29 | v0.106.0 | [@songy23](https://github.com/songy23) | +| 2024-08-12 | v0.107.0 | [@dmitryax](https://github.com/dmitryax) | +| 2024-08-26 | v0.108.0 | [@codeboten](https://github.com/codeboten) | +| 2024-09-09 | v0.109.0 | [@bogdandrutu](https://github.com/bogdandrutu) | +| 2024-09-23 | v0.110.0 | [@jpkrohling](https://github.com/jpkrohling) | +| 2024-10-07 | v0.111.0 | [@mx-psi](https://github.com/mx-psi) | +| 2024-10-21 | v0.112.0 | [@evan-bradley](https://github.com/evan-bradley) | From 6ca551e8788f3ab6b79fdc3e8d4f13e4c217f7c8 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 13 Jun 2024 14:51:31 +0000 Subject: [PATCH 073/168] [chore] Add end to end tests for type casting (#10399) #### Description Adds tests of current type casting behavior when using env and file provider. #### Link to tracking issue Relates to #9854, #8565, #9532 --- confmap/internal/e2e/Makefile | 1 + confmap/internal/e2e/go.mod | 30 ++++ confmap/internal/e2e/go.sum | 28 +++ .../internal/e2e/testdata/types_expand.yaml | 1 + .../e2e/testdata/types_expand_inline.yaml | 1 + confmap/internal/e2e/types_test.go | 168 ++++++++++++++++++ versions.yaml | 1 + 7 files changed, 230 insertions(+) create mode 100644 confmap/internal/e2e/Makefile create mode 100644 confmap/internal/e2e/go.mod create mode 100644 confmap/internal/e2e/go.sum create mode 100644 confmap/internal/e2e/testdata/types_expand.yaml create mode 100644 confmap/internal/e2e/testdata/types_expand_inline.yaml create mode 100644 confmap/internal/e2e/types_test.go diff --git a/confmap/internal/e2e/Makefile b/confmap/internal/e2e/Makefile new file mode 100644 index 00000000000..bdd863a203b --- /dev/null +++ b/confmap/internal/e2e/Makefile @@ -0,0 +1 @@ +include ../../../Makefile.Common diff --git a/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod new file mode 100644 index 00000000000..7cf6804715a --- /dev/null +++ b/confmap/internal/e2e/go.mod @@ -0,0 +1,30 @@ +module go.opentelemetry.io/collector/confmap/internal/e2e + +go 1.21.0 + +require ( + github.com/stretchr/testify v1.9.0 + go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/go-viper/mapstructure/v2 v2.0.0 // indirect + 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.1.1 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace go.opentelemetry.io/collector/confmap => ../../ + +replace go.opentelemetry.io/collector/confmap/provider/fileprovider => ../../provider/fileprovider + +replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../provider/envprovider diff --git a/confmap/internal/e2e/go.sum b/confmap/internal/e2e/go.sum new file mode 100644 index 00000000000..f64ffe49188 --- /dev/null +++ b/confmap/internal/e2e/go.sum @@ -0,0 +1,28 @@ +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/go-viper/mapstructure/v2 v2.0.0 h1:dhn8MZ1gZ0mzeodTG3jt5Vj/o87xZKuNAprG2mQfMfc= +github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= +github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= +github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= +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/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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +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= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/confmap/internal/e2e/testdata/types_expand.yaml b/confmap/internal/e2e/testdata/types_expand.yaml new file mode 100644 index 00000000000..2ffe5ca4628 --- /dev/null +++ b/confmap/internal/e2e/testdata/types_expand.yaml @@ -0,0 +1 @@ +field: ${env:ENV} diff --git a/confmap/internal/e2e/testdata/types_expand_inline.yaml b/confmap/internal/e2e/testdata/types_expand_inline.yaml new file mode 100644 index 00000000000..7235c4b32e9 --- /dev/null +++ b/confmap/internal/e2e/testdata/types_expand_inline.yaml @@ -0,0 +1 @@ +field: "inline field with ${env:ENV} expansion" diff --git a/confmap/internal/e2e/types_test.go b/confmap/internal/e2e/types_test.go new file mode 100644 index 00000000000..2c48b73535b --- /dev/null +++ b/confmap/internal/e2e/types_test.go @@ -0,0 +1,168 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package e2etest + +import ( + "context" + "path/filepath" + "testing" + + "github.com/stretchr/testify/require" + + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/provider/envprovider" + "go.opentelemetry.io/collector/confmap/provider/fileprovider" +) + +type TargetField string + +const ( + TargetFieldInt TargetField = "int_field" + TargetFieldString TargetField = "string_field" + TargetFieldBool TargetField = "bool_field" + TargetFieldInlineString TargetField = "inline_string_field" +) + +type Test struct { + value string + targetField TargetField + expected any + expectedErr string +} + +type TargetConfig[T any] struct { + Field T `mapstructure:"field"` +} + +func AssertExpectedMatch[T any](t *testing.T, tt Test, conf *confmap.Conf, cfg *TargetConfig[T]) { + err := conf.Unmarshal(cfg) + if tt.expectedErr != "" { + require.ErrorContains(t, err, tt.expectedErr) + return + } + require.NoError(t, err) + require.Equal(t, tt.expected, cfg.Field) +} + +func TestTypeCasting(t *testing.T) { + values := []Test{ + { + value: "123", + targetField: TargetFieldInt, + expected: 123, + }, + { + value: "123", + targetField: TargetFieldString, + expected: "123", + }, + { + value: "123", + targetField: TargetFieldInlineString, + expected: "inline field with 123 expansion", + }, + { + value: "0123", + targetField: TargetFieldInt, + expected: 83, + }, + { + value: "0123", + targetField: TargetFieldString, + expected: "83", + }, + { + value: "0123", + targetField: TargetFieldInlineString, + expected: "inline field with 83 expansion", + }, + { + value: "0xdeadbeef", + targetField: TargetFieldInt, + expected: 3735928559, + }, + { + value: "0xdeadbeef", + targetField: TargetFieldString, + expected: "3735928559", + }, + { + value: "0xdeadbeef", + targetField: TargetFieldInlineString, + expected: "inline field with 3735928559 expansion", + }, + { + value: "\"0123\"", + targetField: TargetFieldString, + expected: "0123", + }, + { + value: "\"0123\"", + targetField: TargetFieldInt, + expected: 83, + }, + { + value: "\"0123\"", + targetField: TargetFieldInlineString, + expected: "inline field with 0123 expansion", + }, + { + value: "!!str 0123", + targetField: TargetFieldString, + expected: "0123", + }, + { + value: "!!str 0123", + targetField: TargetFieldInlineString, + expected: "inline field with 0123 expansion", + }, + { + value: "t", + targetField: TargetFieldBool, + expected: true, + }, + { + value: "23", + targetField: TargetFieldBool, + expected: true, + }, + } + + for _, tt := range values { + t.Run(tt.value+"/"+string(tt.targetField), func(t *testing.T) { + testFile := "types_expand.yaml" + if tt.targetField == TargetFieldInlineString { + testFile = "types_expand_inline.yaml" + } + + resolver, err := confmap.NewResolver(confmap.ResolverSettings{ + URIs: []string{filepath.Join("testdata", testFile)}, + ProviderFactories: []confmap.ProviderFactory{ + fileprovider.NewFactory(), + envprovider.NewFactory(), + }, + }) + require.NoError(t, err) + t.Setenv("ENV", tt.value) + + conf, err := resolver.Resolve(context.Background()) + require.NoError(t, err) + + switch tt.targetField { + case TargetFieldInt: + var cfg TargetConfig[int] + AssertExpectedMatch(t, tt, conf, &cfg) + case TargetFieldString, TargetFieldInlineString: + var cfg TargetConfig[string] + AssertExpectedMatch(t, tt, conf, &cfg) + case TargetFieldBool: + var cfg TargetConfig[bool] + AssertExpectedMatch(t, tt, conf, &cfg) + default: + t.Fatalf("unexpected target field %q", tt.targetField) + } + + }) + } +} diff --git a/versions.yaml b/versions.yaml index 49c6b625c58..71140f2d0a9 100644 --- a/versions.yaml +++ b/versions.yaml @@ -62,3 +62,4 @@ excluded-modules: - go.opentelemetry.io/collector/cmd/otelcorecol - go.opentelemetry.io/collector/internal/e2e - go.opentelemetry.io/collector/internal/tools + - go.opentelemetry.io/collector/confmap/internal/e2e From 725e8699bf43c71e1209dccbb444e480bee7bda7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Thu, 13 Jun 2024 19:51:53 +0200 Subject: [PATCH 074/168] [confighttp] Allow compression list for a server to be overridden (#10295) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --------- Signed-off-by: Juraci Paixão Kröhling --- ...low-compression-list-to-be-overridden.yaml | 18 +++ config/confighttp/README.md | 2 + config/confighttp/compression.go | 106 ++++++++++-------- config/confighttp/compression_test.go | 29 ++++- config/confighttp/confighttp.go | 10 +- 5 files changed, 114 insertions(+), 51 deletions(-) create mode 100644 .chloggen/jpkroehling_allow-compression-list-to-be-overridden.yaml diff --git a/.chloggen/jpkroehling_allow-compression-list-to-be-overridden.yaml b/.chloggen/jpkroehling_allow-compression-list-to-be-overridden.yaml new file mode 100644 index 00000000000..e9c1eef9dc3 --- /dev/null +++ b/.chloggen/jpkroehling_allow-compression-list-to-be-overridden.yaml @@ -0,0 +1,18 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'enhancement' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confighttp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Allow the compression list to be overridden + +# One or more tracking issues or pull requests related to the change +issues: [10295] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: Allows Collector administrators to control which compression algorithms to enable for HTTP-based receivers. \ No newline at end of file diff --git a/config/confighttp/README.md b/config/confighttp/README.md index a0227c2402b..49893a0fd63 100644 --- a/config/confighttp/README.md +++ b/config/confighttp/README.md @@ -75,6 +75,7 @@ will not be enabled. not set, browsers use a default of 5 seconds. - `endpoint`: Valid value syntax available [here](https://github.com/grpc/grpc/blob/master/doc/naming.md) - `max_request_body_size`: configures the maximum allowed body size in bytes for a single request. Default: `0` (no restriction) +- `compression_algorithms`: configures the list of compression algorithms the server can accept. Default: ["", "gzip", "zstd", "zlib", "snappy", "deflate"] - [`tls`](../configtls/README.md) - [`auth`](../configauth/README.md) @@ -98,6 +99,7 @@ receivers: - Example-Header max_age: 7200 endpoint: 0.0.0.0:55690 + compression_algorithms: ["", "gzip"] processors: attributes: actions: diff --git a/config/confighttp/compression.go b/config/confighttp/compression.go index a700bec845b..4498fefe864 100644 --- a/config/confighttp/compression.go +++ b/config/confighttp/compression.go @@ -25,6 +25,53 @@ type compressRoundTripper struct { compressor *compressor } +var availableDecoders = map[string]func(body io.ReadCloser) (io.ReadCloser, error){ + "": func(io.ReadCloser) (io.ReadCloser, error) { + // Not a compressed payload. Nothing to do. + return nil, nil + }, + "gzip": func(body io.ReadCloser) (io.ReadCloser, error) { + gr, err := gzip.NewReader(body) + if err != nil { + return nil, err + } + return gr, nil + }, + "zstd": func(body io.ReadCloser) (io.ReadCloser, error) { + zr, err := zstd.NewReader( + body, + // Concurrency 1 disables async decoding. We don't need async decoding, it is pointless + // for our use-case (a server accepting decoding http requests). + // Disabling async improves performance (I benchmarked it previously when working + // on https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/23257). + zstd.WithDecoderConcurrency(1), + ) + if err != nil { + return nil, err + } + return zr.IOReadCloser(), nil + }, + "zlib": func(body io.ReadCloser) (io.ReadCloser, error) { + zr, err := zlib.NewReader(body) + if err != nil { + return nil, err + } + return zr, nil + }, + "snappy": func(body io.ReadCloser) (io.ReadCloser, error) { + sr := snappy.NewReader(body) + sb := new(bytes.Buffer) + _, err := io.Copy(sb, sr) + if err != nil { + return nil, err + } + if err = body.Close(); err != nil { + return nil, err + } + return io.NopCloser(sb), nil + }, +} + func newCompressRoundTripper(rt http.RoundTripper, compressionType configcompression.Type) (*compressRoundTripper, error) { encoder, err := newCompressor(compressionType) if err != nil { @@ -77,64 +124,27 @@ type decompressor struct { // by identifying the compression format in the "Content-Encoding" header and re-writing // request body so that the handlers further in the chain can work on decompressed data. // It supports gzip and deflate/zlib compression. -func httpContentDecompressor(h http.Handler, maxRequestBodySize int64, eh func(w http.ResponseWriter, r *http.Request, errorMsg string, statusCode int), decoders map[string]func(body io.ReadCloser) (io.ReadCloser, error)) http.Handler { +func httpContentDecompressor(h http.Handler, maxRequestBodySize int64, eh func(w http.ResponseWriter, r *http.Request, errorMsg string, statusCode int), enableDecoders []string, decoders map[string]func(body io.ReadCloser) (io.ReadCloser, error)) http.Handler { errHandler := defaultErrorHandler if eh != nil { errHandler = eh } + enabled := map[string]func(body io.ReadCloser) (io.ReadCloser, error){} + for _, dec := range enableDecoders { + enabled[dec] = availableDecoders[dec] + + if dec == "deflate" { + enabled["deflate"] = availableDecoders["zlib"] + } + } + d := &decompressor{ maxRequestBodySize: maxRequestBodySize, errHandler: errHandler, base: h, - decoders: map[string]func(body io.ReadCloser) (io.ReadCloser, error){ - "": func(io.ReadCloser) (io.ReadCloser, error) { - // Not a compressed payload. Nothing to do. - return nil, nil - }, - "gzip": func(body io.ReadCloser) (io.ReadCloser, error) { - gr, err := gzip.NewReader(body) - if err != nil { - return nil, err - } - return gr, nil - }, - "zstd": func(body io.ReadCloser) (io.ReadCloser, error) { - zr, err := zstd.NewReader( - body, - // Concurrency 1 disables async decoding. We don't need async decoding, it is pointless - // for our use-case (a server accepting decoding http requests). - // Disabling async improves performance (I benchmarked it previously when working - // on https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/23257). - zstd.WithDecoderConcurrency(1), - ) - if err != nil { - return nil, err - } - return zr.IOReadCloser(), nil - }, - "zlib": func(body io.ReadCloser) (io.ReadCloser, error) { - zr, err := zlib.NewReader(body) - if err != nil { - return nil, err - } - return zr, nil - }, - "snappy": func(body io.ReadCloser) (io.ReadCloser, error) { - sr := snappy.NewReader(body) - sb := new(bytes.Buffer) - _, err := io.Copy(sb, sr) - if err != nil { - return nil, err - } - if err = body.Close(); err != nil { - return nil, err - } - return io.NopCloser(sb), nil - }, - }, + decoders: enabled, } - d.decoders["deflate"] = d.decoders["zlib"] for key, dec := range decoders { d.decoders[key] = dec diff --git a/config/confighttp/compression_test.go b/config/confighttp/compression_test.go index db2f7b3b3c0..a4fcb013f4f 100644 --- a/config/confighttp/compression_test.go +++ b/config/confighttp/compression_test.go @@ -134,7 +134,7 @@ func TestHTTPCustomDecompression(t *testing.T) { return io.NopCloser(strings.NewReader("decompressed body")), nil }, } - srv := httptest.NewServer(httpContentDecompressor(handler, defaultMaxRequestBodySize, defaultErrorHandler, decoders)) + srv := httptest.NewServer(httpContentDecompressor(handler, defaultMaxRequestBodySize, defaultErrorHandler, defaultCompressionAlgorithms, decoders)) t.Cleanup(srv.Close) @@ -253,7 +253,7 @@ func TestHTTPContentDecompressionHandler(t *testing.T) { require.NoError(t, err, "failed to read request body: %v", err) assert.EqualValues(t, testBody, string(body)) w.WriteHeader(http.StatusOK) - }), defaultMaxRequestBodySize, defaultErrorHandler, noDecoders)) + }), defaultMaxRequestBodySize, defaultErrorHandler, defaultCompressionAlgorithms, noDecoders)) t.Cleanup(srv.Close) req, err := http.NewRequest(http.MethodGet, srv.URL, tt.reqBody) @@ -349,6 +349,31 @@ func TestHTTPContentCompressionRequestBodyCloseError(t *testing.T) { require.Error(t, err) } +func TestOverrideCompressionList(t *testing.T) { + // prepare + configuredDecoders := []string{"none", "zlib"} + + srv := httptest.NewServer(httpContentDecompressor(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + w.WriteHeader(http.StatusOK) + }), defaultMaxRequestBodySize, defaultErrorHandler, configuredDecoders, nil)) + t.Cleanup(srv.Close) + + req, err := http.NewRequest(http.MethodGet, srv.URL, compressSnappy(t, []byte("123decompressed body"))) + require.NoError(t, err, "failed to create request to test handler") + req.Header.Set("Content-Encoding", "snappy") + + client := http.Client{} + + // test + res, err := client.Do(req) + require.NoError(t, err) + + // verify + assert.Equal(t, http.StatusBadRequest, res.StatusCode, "test handler returned unexpected status code ") + _, err = io.ReadAll(res.Body) + require.NoError(t, res.Body.Close(), "failed to close request body: %v", err) +} + func compressGzip(t testing.TB, body []byte) *bytes.Buffer { var buf bytes.Buffer gw := gzip.NewWriter(&buf) diff --git a/config/confighttp/confighttp.go b/config/confighttp/confighttp.go index 28e3d72cb67..889eb08c649 100644 --- a/config/confighttp/confighttp.go +++ b/config/confighttp/confighttp.go @@ -31,6 +31,7 @@ import ( const headerContentEncoding = "Content-Encoding" const defaultMaxRequestBodySize = 20 * 1024 * 1024 // 20MiB +var defaultCompressionAlgorithms = []string{"", "gzip", "zstd", "zlib", "snappy", "deflate"} // ClientConfig defines settings for creating an HTTP client. type ClientConfig struct { @@ -283,6 +284,9 @@ type ServerConfig struct { // Additional headers attached to each HTTP response sent to the client. // Header values are opaque since they may be sensitive. ResponseHeaders map[string]configopaque.String `mapstructure:"response_headers"` + + // CompressionAlgorithms configures the list of compression algorithms the server can accept. Default: ["", "gzip", "zstd", "zlib", "snappy", "deflate"] + CompressionAlgorithms []string `mapstructure:"compression_algorithms"` } // ToListener creates a net.Listener. @@ -348,7 +352,11 @@ func (hss *ServerConfig) ToServer(_ context.Context, host component.Host, settin hss.MaxRequestBodySize = defaultMaxRequestBodySize } - handler = httpContentDecompressor(handler, hss.MaxRequestBodySize, serverOpts.errHandler, serverOpts.decoders) + if hss.CompressionAlgorithms == nil { + hss.CompressionAlgorithms = defaultCompressionAlgorithms + } + + handler = httpContentDecompressor(handler, hss.MaxRequestBodySize, serverOpts.errHandler, hss.CompressionAlgorithms, serverOpts.decoders) if hss.MaxRequestBodySize > 0 { handler = maxRequestBodySizeInterceptor(handler, hss.MaxRequestBodySize) From 65d59d14011f1b4cfa100aa70d42bb0ea8415c54 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:04:40 -0600 Subject: [PATCH 075/168] [confmap] remove bool logic from expandURI (#10403) expandURI can always be viewed as changing the value as long as no error is returned. --- confmap/expand.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/confmap/expand.go b/confmap/expand.go index 768395f76fd..11537e0d00f 100644 --- a/confmap/expand.go +++ b/confmap/expand.go @@ -111,9 +111,13 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo if uri == input { // If the value is a single URI, then the return value can be anything. // This is the case `foo: ${file:some_extra_config.yml}`. - return mr.expandURI(ctx, input) + expanded, err := mr.expandURI(ctx, input) + if err != nil { + return input, false, err + } + return expanded, true, err } - expanded, changed, err := mr.expandURI(ctx, uri) + expanded, err := mr.expandURI(ctx, uri) if err != nil { return input, false, err } @@ -121,7 +125,7 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo if err != nil { return input, false, fmt.Errorf("expanding %v: %w", uri, err) } - return strings.ReplaceAll(input, uri, repl), changed, err + return strings.ReplaceAll(input, uri, repl), true, err } // toString attempts to convert input to a string. @@ -142,7 +146,7 @@ func toString(input any) (string, error) { } } -func (mr *Resolver) expandURI(ctx context.Context, input string) (any, bool, error) { +func (mr *Resolver) expandURI(ctx context.Context, input string) (any, error) { // strip ${ and } uri := input[2 : len(input)-1] @@ -152,19 +156,18 @@ func (mr *Resolver) expandURI(ctx context.Context, input string) (any, bool, err lURI, err := newLocation(uri) if err != nil { - return nil, false, err + return nil, err } if strings.Contains(lURI.opaqueValue, "$") { - return nil, false, fmt.Errorf("the uri %q contains unsupported characters ('$')", lURI.asString()) + return nil, fmt.Errorf("the uri %q contains unsupported characters ('$')", lURI.asString()) } ret, err := mr.retrieveValue(ctx, lURI) if err != nil { - return nil, false, err + return nil, err } mr.closers = append(mr.closers, ret.Close) - val, err := ret.AsRaw() - return val, true, err + return ret.AsRaw() } type location struct { From ad2c9796f9a7bbebeb401ac43c38febaebf3519a Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 14 Jun 2024 06:05:45 -0600 Subject: [PATCH 076/168] [confmap] Add featuregate to use stable expansion rules (#10391) #### Description This PR adds a feature gate that will handle transitioning users away from expandconverter, specifically expanding `$VAR` syntax. The wholistic strategy is: 1. create a new feature gate, `confmap.unifyEnvVarExpansion`, that will be the single feature gate to manage unifying collector configuraiton resolution. 2. Update expandconverter to return an error if the feature gate is enabled and it is about to expand `$VAR` syntax. 3. Update `otelcol.NewCommand` to set a `DefaultScheme="env"` when the feature gate is enabled and no `DefaultScheme` is set, this handles `${VAR}` syntax. 4. Separately, deprecate `expandconverter`. 5. Follow a normal feature gate cycle. 6. Removed the `confmap.unifyEnvVarExpansion` feature gates and `expandconverter` at the same time Supersedes https://github.com/open-telemetry/opentelemetry-collector/pull/10259 #### Link to tracking issue Related to https://github.com/open-telemetry/opentelemetry-collector/issues/10161 Related to https://github.com/open-telemetry/opentelemetry-collector/issues/8215 Related to https://github.com/open-telemetry/opentelemetry-collector/issues/7111 #### Testing Unit tests --- .../confmap-add-expand-featuregate-3.yaml | 29 ++++++++++++ .chloggen/confmap-add-expand-featuregate.yaml | 29 ++++++++++++ confmap/converter/expandconverter/expand.go | 6 +++ .../converter/expandconverter/expand_test.go | 27 ++++++++++++ confmap/converter/expandconverter/go.mod | 19 +++++++- confmap/converter/expandconverter/go.sum | 12 +++-- confmap/go.mod | 3 ++ confmap/go.sum | 16 +++++-- confmap/internal/e2e/go.sum | 9 +++- confmap/provider/envprovider/go.sum | 10 +++-- confmap/provider/fileprovider/go.sum | 10 +++-- confmap/provider/httpprovider/go.sum | 10 +++-- confmap/provider/httpsprovider/go.sum | 10 +++-- confmap/provider/yamlprovider/go.sum | 10 +++-- filter/go.sum | 9 +++- internal/featuregates/featuregates.go | 11 +++++ otelcol/command.go | 6 +++ otelcol/command_test.go | 44 +++++++++++++++++++ otelcol/go.mod | 2 +- 19 files changed, 240 insertions(+), 32 deletions(-) create mode 100644 .chloggen/confmap-add-expand-featuregate-3.yaml create mode 100644 .chloggen/confmap-add-expand-featuregate.yaml create mode 100644 internal/featuregates/featuregates.go diff --git a/.chloggen/confmap-add-expand-featuregate-3.yaml b/.chloggen/confmap-add-expand-featuregate-3.yaml new file mode 100644 index 00000000000..98d2f8741df --- /dev/null +++ b/.chloggen/confmap-add-expand-featuregate-3.yaml @@ -0,0 +1,29 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol/expandconverter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add `confmap.unifyEnvVarExpansion` feature gate to allow enabling Collector/Configuration SIG environment variable expansion rules. + +# One or more tracking issues or pull requests related to the change +issues: [10391] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + When enabled, this feature gate will: + - Disable expansion of BASH-style env vars (`$FOO`) + - `${FOO}` will be expanded as if it was `${env:FOO} + See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/.chloggen/confmap-add-expand-featuregate.yaml b/.chloggen/confmap-add-expand-featuregate.yaml new file mode 100644 index 00000000000..d372c39c4bb --- /dev/null +++ b/.chloggen/confmap-add-expand-featuregate.yaml @@ -0,0 +1,29 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confmap + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add `confmap.unifyEnvVarExpansion` feature gate to allow enabling Collector/Configuration SIG environment variable expansion rules. + +# One or more tracking issues or pull requests related to the change +issues: [10259] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + When enabled, this feature gate will: + - Disable expansion of BASH-style env vars (`$FOO`) + - `${FOO}` will be expanded as if it was `${env:FOO} + See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/confmap/converter/expandconverter/expand.go b/confmap/converter/expandconverter/expand.go index ecac0cdaa25..38b84140674 100644 --- a/confmap/converter/expandconverter/expand.go +++ b/confmap/converter/expandconverter/expand.go @@ -5,6 +5,7 @@ package expandconverter // import "go.opentelemetry.io/collector/confmap/convert import ( "context" + "errors" "fmt" "os" "regexp" @@ -13,6 +14,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/internal/envvar" + "go.opentelemetry.io/collector/internal/featuregates" ) type converter struct { @@ -92,6 +94,10 @@ func (c converter) expandEnv(s string) (string, error) { // in order to make sure we don't log a warning for ${VAR} var regex = regexp.MustCompile(fmt.Sprintf(`\$%s`, regexp.QuoteMeta(str))) if _, exists := c.loggedDeprecations[str]; !exists && regex.MatchString(s) { + if featuregates.UseUnifiedEnvVarExpansionRules.IsEnabled() { + err = errors.New("$VAR expansion is not supported when feature gate confmap.unifyEnvVarExpansion is enabled") + return "" + } msg := fmt.Sprintf("Variable substitution using $VAR will be deprecated in favor of ${VAR} and ${env:VAR}, please update $%s", str) c.logger.Warn(msg, zap.String("variable", str)) c.loggedDeprecations[str] = struct{}{} diff --git a/confmap/converter/expandconverter/expand_test.go b/confmap/converter/expandconverter/expand_test.go index 45e10f8536a..6cd7fb881ee 100644 --- a/confmap/converter/expandconverter/expand_test.go +++ b/confmap/converter/expandconverter/expand_test.go @@ -18,6 +18,8 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/internal/envvar" + "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/featuregates" ) func TestNewExpandConverter(t *testing.T) { @@ -56,6 +58,31 @@ func TestNewExpandConverter(t *testing.T) { } } +func TestNewExpandConverter_UseUnifiedEnvVarExpansionRules(t *testing.T) { + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), true)) + t.Cleanup(func() { + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), false)) + }) + + const valueExtra = "some string" + const valueExtraMapValue = "some map value" + const valueExtraListMapValue = "some list map value" + const valueExtraListElement = "some list value" + t.Setenv("EXTRA", valueExtra) + t.Setenv("EXTRA_MAP_VALUE_1", valueExtraMapValue+"_1") + t.Setenv("EXTRA_MAP_VALUE_2", valueExtraMapValue+"_2") + t.Setenv("EXTRA_LIST_MAP_VALUE_1", valueExtraListMapValue+"_1") + t.Setenv("EXTRA_LIST_MAP_VALUE_2", valueExtraListMapValue+"_2") + t.Setenv("EXTRA_LIST_VALUE_1", valueExtraListElement+"_1") + t.Setenv("EXTRA_LIST_VALUE_2", valueExtraListElement+"_2") + + conf, err := confmaptest.LoadConf(filepath.Join("testdata", "expand-with-all-env.yaml")) + require.NoError(t, err, "Unable to get config") + + // Test that expanded configs are the same with the simple config with no env vars. + require.ErrorContains(t, createConverter().Convert(context.Background(), conf), "$VAR expansion is not supported when feature gate confmap.unifyEnvVarExpansion is enabled") +} + func TestNewExpandConverter_EscapedMaps(t *testing.T) { const receiverExtraMapValue = "some map value" t.Setenv("MAP_VALUE", receiverExtraMapValue) diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index 1ebfb017ef5..753fc21a231 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -4,7 +4,9 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 + go.opentelemetry.io/collector v0.102.1 go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/featuregate v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -12,6 +14,7 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect @@ -22,4 +25,18 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace go.opentelemetry.io/collector/confmap => ../../ +replace go.opentelemetry.io/collector/component => ../../../component + +replace go.opentelemetry.io/collector/confmap => ../.. + +replace go.opentelemetry.io/collector => ../../.. + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../../config/configtelemetry + +replace go.opentelemetry.io/collector/pdata/testdata => ../../../pdata/testdata + +replace go.opentelemetry.io/collector/pdata => ../../../pdata + +replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/consumer => ../../../consumer diff --git a/confmap/converter/expandconverter/go.sum b/confmap/converter/expandconverter/go.sum index e70f902d5f5..5cc7187072e 100644 --- a/confmap/converter/expandconverter/go.sum +++ b/confmap/converter/expandconverter/go.sum @@ -2,14 +2,16 @@ 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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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= @@ -18,6 +20,8 @@ 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/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -27,7 +31,7 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/confmap/go.mod b/confmap/go.mod index 6a0cbf641ea..7fb8185c539 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -16,9 +16,12 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.10.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect ) retract ( diff --git a/confmap/go.sum b/confmap/go.sum index e70f902d5f5..c42b46e7c12 100644 --- a/confmap/go.sum +++ b/confmap/go.sum @@ -1,3 +1,4 @@ +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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -8,16 +9,23 @@ 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.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= 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.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -27,7 +35,7 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/confmap/internal/e2e/go.sum b/confmap/internal/e2e/go.sum index f64ffe49188..1f734bb155a 100644 --- a/confmap/internal/e2e/go.sum +++ b/confmap/internal/e2e/go.sum @@ -8,12 +8,18 @@ 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.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +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/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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -22,7 +28,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/confmap/provider/envprovider/go.sum b/confmap/provider/envprovider/go.sum index e70f902d5f5..cbad5e85c71 100644 --- a/confmap/provider/envprovider/go.sum +++ b/confmap/provider/envprovider/go.sum @@ -8,8 +8,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.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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= @@ -18,6 +18,8 @@ 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/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -27,7 +29,7 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/confmap/provider/fileprovider/go.sum b/confmap/provider/fileprovider/go.sum index e70f902d5f5..cbad5e85c71 100644 --- a/confmap/provider/fileprovider/go.sum +++ b/confmap/provider/fileprovider/go.sum @@ -8,8 +8,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.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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= @@ -18,6 +18,8 @@ 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/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -27,7 +29,7 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/confmap/provider/httpprovider/go.sum b/confmap/provider/httpprovider/go.sum index e70f902d5f5..cbad5e85c71 100644 --- a/confmap/provider/httpprovider/go.sum +++ b/confmap/provider/httpprovider/go.sum @@ -8,8 +8,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.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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= @@ -18,6 +18,8 @@ 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/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -27,7 +29,7 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/confmap/provider/httpsprovider/go.sum b/confmap/provider/httpsprovider/go.sum index e70f902d5f5..cbad5e85c71 100644 --- a/confmap/provider/httpsprovider/go.sum +++ b/confmap/provider/httpsprovider/go.sum @@ -8,8 +8,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.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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= @@ -18,6 +18,8 @@ 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/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -27,7 +29,7 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/confmap/provider/yamlprovider/go.sum b/confmap/provider/yamlprovider/go.sum index e70f902d5f5..cbad5e85c71 100644 --- a/confmap/provider/yamlprovider/go.sum +++ b/confmap/provider/yamlprovider/go.sum @@ -8,8 +8,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.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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= @@ -18,6 +18,8 @@ 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/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -27,7 +29,7 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/filter/go.sum b/filter/go.sum index 4fac02f5c47..cbad5e85c71 100644 --- a/filter/go.sum +++ b/filter/go.sum @@ -8,12 +8,18 @@ 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.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +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/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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -22,7 +28,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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/internal/featuregates/featuregates.go b/internal/featuregates/featuregates.go new file mode 100644 index 00000000000..da2017f5831 --- /dev/null +++ b/internal/featuregates/featuregates.go @@ -0,0 +1,11 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package featuregates // import "go.opentelemetry.io/collector/internal/featuregates" + +import "go.opentelemetry.io/collector/featuregate" + +var UseUnifiedEnvVarExpansionRules = featuregate.GlobalRegistry().MustRegister("confmap.unifyEnvVarExpansion", + featuregate.StageAlpha, + featuregate.WithRegisterFromVersion("v0.103.0"), + featuregate.WithRegisterDescription("`${FOO}` will now be expanded as if it was `${env:FOO}` and no longer expands $ENV syntax. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. When this feature gate is stable, expandconverter will be removed.")) diff --git a/otelcol/command.go b/otelcol/command.go index db336c34cfb..cd0ee98e7be 100644 --- a/otelcol/command.go +++ b/otelcol/command.go @@ -10,6 +10,7 @@ import ( "github.com/spf13/cobra" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/featuregates" ) // NewCommand constructs a new cobra.Command using the given CollectorSettings. @@ -67,6 +68,11 @@ func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet, enfor if len(resolverSet.URIs) == 0 { return errors.New("at least one config flag must be provided") } + + if featuregates.UseUnifiedEnvVarExpansionRules.IsEnabled() && set.ConfigProviderSettings.ResolverSettings.DefaultScheme == "" { + set.ConfigProviderSettings.ResolverSettings.DefaultScheme = "env" + } + // Provide a default set of providers and converters if none have been specified. // TODO: Remove this after CollectorSettings.ConfigProvider is removed and instead // do it in the builder. diff --git a/otelcol/command_test.go b/otelcol/command_test.go index 0fb2ccfb668..388df2591d2 100644 --- a/otelcol/command_test.go +++ b/otelcol/command_test.go @@ -14,8 +14,10 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/converter/expandconverter" + "go.opentelemetry.io/collector/confmap/provider/envprovider" "go.opentelemetry.io/collector/confmap/provider/fileprovider" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/featuregates" ) func TestNewCommandVersion(t *testing.T) { @@ -130,3 +132,45 @@ func TestNoProvidersReturnsError(t *testing.T) { err = updateSettingsUsingFlags(&set, flgs, true) require.ErrorContains(t, err, "at least one Provider must be supplied") } + +func Test_UseUnifiedEnvVarExpansionRules(t *testing.T) { + tests := []struct { + name string + input string + expected string + }{ + { + name: "default scheme set", + input: "file", + expected: "file", + }, + { + name: "default scheme not set", + input: "", + expected: "env", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), true)) + t.Cleanup(func() { + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), false)) + }) + set := CollectorSettings{ + ConfigProviderSettings: ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory(), envprovider.NewFactory()}, + DefaultScheme: tt.input, + }, + }, + } + flgs := flags(featuregate.NewRegistry()) + err := flgs.Parse([]string{"--config=otelcol-nop.yaml"}) + require.NoError(t, err) + + err = updateSettingsUsingFlags(&set, flgs, true) + require.NoError(t, err) + require.Equal(t, tt.expected, set.ConfigProviderSettings.ResolverSettings.DefaultScheme) + }) + } +} diff --git a/otelcol/go.mod b/otelcol/go.mod index 2b39453df65..bf09630c14c 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,6 +5,7 @@ go 1.21.0 require ( github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 + go.opentelemetry.io/collector v0.102.1 go.opentelemetry.io/collector/component v0.102.1 go.opentelemetry.io/collector/config/configtelemetry v0.102.1 go.opentelemetry.io/collector/confmap v0.102.1 @@ -67,7 +68,6 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.102.1 // indirect go.opentelemetry.io/collector/consumer v0.102.1 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.102.1 // indirect From 9cd56bf48e98e6ac319b4cb2114cd3a07df42af4 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 14 Jun 2024 09:54:03 -0600 Subject: [PATCH 077/168] [chore] Trade release weeks (#10410) --- docs/release.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/release.md b/docs/release.md index 04fae1dcd9f..fd637732ec3 100644 --- a/docs/release.md +++ b/docs/release.md @@ -156,15 +156,15 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR ## Release schedule -| Date | Version | Release manager | -|------------|----------|--------------------------------------------------| -| 2024-06-17 | v0.103.0 | [@djaglowski](https://github.com/djaglowski) | -| 2024-07-01 | v0.104.0 | [@atoulme](https://github.com/atoulme) | -| 2024-07-15 | v0.105.0 | [@TylerHelmuth](https://github.com/TylerHelmuth) | -| 2024-07-29 | v0.106.0 | [@songy23](https://github.com/songy23) | -| 2024-08-12 | v0.107.0 | [@dmitryax](https://github.com/dmitryax) | -| 2024-08-26 | v0.108.0 | [@codeboten](https://github.com/codeboten) | -| 2024-09-09 | v0.109.0 | [@bogdandrutu](https://github.com/bogdandrutu) | -| 2024-09-23 | v0.110.0 | [@jpkrohling](https://github.com/jpkrohling) | -| 2024-10-07 | v0.111.0 | [@mx-psi](https://github.com/mx-psi) | -| 2024-10-21 | v0.112.0 | [@evan-bradley](https://github.com/evan-bradley) | +| Date | Version | Release manager | +|------------|----------|---------------------------------------------------| +| 2024-06-17 | v0.103.0 | [@djaglowski](https://github.com/djaglowski) | +| 2024-07-01 | v0.104.0 | [@TylerHelmuth](https://github.com/TylerHelmuth) | +| 2024-07-15 | v0.105.0 | [@atoulme](https://github.com/atoulme) | +| 2024-07-29 | v0.106.0 | [@songy23](https://github.com/songy23) | +| 2024-08-12 | v0.107.0 | [@dmitryax](https://github.com/dmitryax) | +| 2024-08-26 | v0.108.0 | [@codeboten](https://github.com/codeboten) | +| 2024-09-09 | v0.109.0 | [@bogdandrutu](https://github.com/bogdandrutu) | +| 2024-09-23 | v0.110.0 | [@jpkrohling](https://github.com/jpkrohling) | +| 2024-10-07 | v0.111.0 | [@mx-psi](https://github.com/mx-psi) | +| 2024-10-21 | v0.112.0 | [@evan-bradley](https://github.com/evan-bradley) | From 42b61cc6040550eb4b96231d3c5f0c9f0cd0f74b Mon Sep 17 00:00:00 2001 From: chenzhiguo Date: Sat, 15 Jun 2024 00:03:40 +0800 Subject: [PATCH 078/168] Update image version to latest #10407 (#10408) During the installation of otlp in recent days, it was found that the installed version is somewhat outdated, which is not conducive to users trying out the latest features. It's also unnecessary to modify the installation yaml file every time a new version is released. Would it be more appropriate to change it to "latest"? --- examples/k8s/otel-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index 791af80fc55..8538e82add4 100644 --- a/examples/k8s/otel-config.yaml +++ b/examples/k8s/otel-config.yaml @@ -65,7 +65,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-agent-config.yaml" - image: otel/opentelemetry-collector:0.94.0 + image: otel/opentelemetry-collector:latest name: otel-agent resources: limits: @@ -183,7 +183,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.94.0 + image: otel/opentelemetry-collector:latest name: otel-collector resources: limits: From 48af1b8ea63a3393e468368beed47ce3668e5c73 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Fri, 14 Jun 2024 13:46:46 -0700 Subject: [PATCH 079/168] [chore][golangci-lint] Remove gosec excludes (#10411) #### Description The upstream issue was fixed by https://github.com/golangci/golangci-lint/pull/4748, which was included in release [`v1.59.0`](https://github.com/golangci/golangci-lint/releases/tag/v1.59.0) of `golangci-lint`. From local testing, we're pulling version `v1.59.0` of `golangci-lint`, so the issue should be resolved. Local runtime with excludes: ``` $ .tools/golangci-lint run -v --enable-only gosec ... INFO Execution took 1.866075148s INFO Execution took 1.218805785s INFO Execution took 1.09527985s ``` Local runtime without excludes: ``` $ .tools/golangci-lint run -v --enable-only gosec ... INFO Execution took 2.244716429s INFO Execution took 1.539717296s INFO Execution took 1.530163777s ``` Note: I ran `.tools/golangci-lint cache clean` between each test to clean the cache and keep results as consistent as possible. #### Link to tracking issue Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/10213 --- .golangci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 103ebae9c18..b106c5d8f23 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -119,13 +119,6 @@ linters-settings: files: - "!**/*_test.go" - gosec: - excludes: - # https://github.com/open-telemetry/opentelemetry-collector/issues/10213 - - G601 - # https://github.com/open-telemetry/opentelemetry-collector/issues/10213 - - G113 - linters: enable: - depguard From 7a3c35cb77f5eb2d1d3fa3478ce8d94a56a6434a Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 17 Jun 2024 11:29:35 +0000 Subject: [PATCH 080/168] [confmap] Add strict type validation under a feature gate (#10400) #### Description - Add `confmap.strictlyTypedInput` feature gate that introduces stricter type checks when resolving configuration - Make `confmap.NewRetrievedFromYAML` function public so that external providers have consistent behavior when resolving YAML - Adds `confmap.Retrieved.AsString` method to retrieve string representation for retrieved values #### Link to tracking issue Relates to #9854, updates #8565, #9532 --- .chloggen/mx-psi_asstring.yaml | 25 +++ .chloggen/mx-psi_newretrievedfromyaml.yaml | 25 +++ .chloggen/mx-psi_weaklytypedinput.yaml | 28 ++++ cmd/mdatagen/go.mod | 2 + cmd/mdatagen/go.sum | 2 + config/configauth/go.mod | 4 + config/configauth/go.sum | 2 + confmap/confmap.go | 3 +- confmap/expand.go | 28 +++- confmap/go.mod | 7 +- confmap/go.sum | 8 +- confmap/internal/e2e/go.mod | 4 + confmap/internal/e2e/go.sum | 2 + confmap/internal/e2e/types_test.go | 154 +++++++++++++++++- confmap/internal/featuregate.go | 14 ++ confmap/provider.go | 55 ++++++- confmap/provider/envprovider/go.mod | 4 + confmap/provider/envprovider/go.sum | 2 + confmap/provider/envprovider/provider.go | 3 +- confmap/provider/fileprovider/go.mod | 4 + confmap/provider/fileprovider/go.sum | 2 + confmap/provider/fileprovider/provider.go | 3 +- confmap/provider/httpprovider/go.mod | 4 + confmap/provider/httpprovider/go.sum | 2 + confmap/provider/httpsprovider/go.mod | 4 + confmap/provider/httpsprovider/go.sum | 2 + .../configurablehttpprovider/provider.go | 3 +- confmap/provider/internal/provider.go | 21 --- confmap/provider/internal/provider_test.go | 47 ------ confmap/provider/yamlprovider/go.mod | 4 + confmap/provider/yamlprovider/go.sum | 2 + confmap/provider/yamlprovider/provider.go | 3 +- confmap/provider_test.go | 109 +++++++++++++ connector/forwardconnector/go.mod | 2 + connector/forwardconnector/go.sum | 2 + exporter/debugexporter/go.mod | 2 + exporter/debugexporter/go.sum | 2 + exporter/go.mod | 2 + exporter/go.sum | 2 + exporter/loggingexporter/go.mod | 2 + exporter/loggingexporter/go.sum | 2 + exporter/nopexporter/go.mod | 2 + exporter/nopexporter/go.sum | 2 + extension/auth/go.mod | 4 + extension/auth/go.sum | 2 + extension/ballastextension/go.mod | 2 + extension/ballastextension/go.sum | 2 + extension/go.mod | 4 + extension/go.sum | 2 + extension/memorylimiterextension/go.mod | 2 + extension/memorylimiterextension/go.sum | 2 + filter/go.mod | 4 + filter/go.sum | 2 + processor/batchprocessor/go.mod | 2 + processor/batchprocessor/go.sum | 2 + processor/memorylimiterprocessor/go.mod | 2 + processor/memorylimiterprocessor/go.sum | 2 + receiver/nopreceiver/go.mod | 2 + receiver/nopreceiver/go.sum | 2 + 59 files changed, 541 insertions(+), 99 deletions(-) create mode 100644 .chloggen/mx-psi_asstring.yaml create mode 100644 .chloggen/mx-psi_newretrievedfromyaml.yaml create mode 100644 .chloggen/mx-psi_weaklytypedinput.yaml create mode 100644 confmap/internal/featuregate.go delete mode 100644 confmap/provider/internal/provider.go delete mode 100644 confmap/provider/internal/provider_test.go diff --git a/.chloggen/mx-psi_asstring.yaml b/.chloggen/mx-psi_asstring.yaml new file mode 100644 index 00000000000..51f2aed1f7a --- /dev/null +++ b/.chloggen/mx-psi_asstring.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confmap + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Adds `confmap.Retrieved.AsString` method that returns the configuration value as a string" + +# One or more tracking issues or pull requests related to the change +issues: [9532] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/.chloggen/mx-psi_newretrievedfromyaml.yaml b/.chloggen/mx-psi_newretrievedfromyaml.yaml new file mode 100644 index 00000000000..770fdc36439 --- /dev/null +++ b/.chloggen/mx-psi_newretrievedfromyaml.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confmap + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Adds `confmap.NewRetrievedFromYAML` helper to create `confmap.Retrieved` values from YAML bytes" + +# One or more tracking issues or pull requests related to the change +issues: [9532] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/.chloggen/mx-psi_weaklytypedinput.yaml b/.chloggen/mx-psi_weaklytypedinput.yaml new file mode 100644 index 00000000000..68700dd43d6 --- /dev/null +++ b/.chloggen/mx-psi_weaklytypedinput.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confmap + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Adds alpha `confmap.strictlyTypedInput` feature gate that enables strict type checks during configuration resolution" + +# One or more tracking issues or pull requests related to the change +issues: [9532] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + When enabled, the configuration resolution system will: + - Stop doing most kinds of implicit type casting when resolving configuration values + - Use the original string representation of configuration values if the ${} syntax is used in inline position + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index db997ca670a..45876397fa2 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -32,6 +32,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -45,6 +46,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 16811877544..40898cf22fd 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -19,6 +19,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 6ad2b2633ef..fbdcfe8ff16 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -14,6 +14,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect @@ -22,6 +23,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/collector/confmap v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect @@ -48,3 +50,5 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemet replace go.opentelemetry.io/collector/extension => ../../extension replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth + +replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/config/configauth/go.sum b/config/configauth/go.sum index e2c5ce4ef77..59c1b968fcf 100644 --- a/config/configauth/go.sum +++ b/config/configauth/go.sum @@ -14,6 +14,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 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/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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= diff --git a/confmap/confmap.go b/confmap/confmap.go index 8a32216a2df..39bbc53cc33 100644 --- a/confmap/confmap.go +++ b/confmap/confmap.go @@ -16,6 +16,7 @@ import ( "github.com/knadh/koanf/providers/confmap" "github.com/knadh/koanf/v2" + "go.opentelemetry.io/collector/confmap/internal" encoder "go.opentelemetry.io/collector/confmap/internal/mapstructure" ) @@ -156,7 +157,7 @@ func decodeConfig(m *Conf, result any, errorUnused bool, skipTopLevelUnmarshaler ErrorUnused: errorUnused, Result: result, TagName: "mapstructure", - WeaklyTypedInput: true, + WeaklyTypedInput: !internal.StrictlyTypedInputGate.IsEnabled(), MatchName: caseSensitiveMatchName, DecodeHook: mapstructure.ComposeDecodeHookFunc( expandNilStructPointersHookFunc(), diff --git a/confmap/expand.go b/confmap/expand.go index 11537e0d00f..efc4bb95911 100644 --- a/confmap/expand.go +++ b/confmap/expand.go @@ -11,6 +11,8 @@ import ( "regexp" "strconv" "strings" + + "go.opentelemetry.io/collector/confmap/internal" ) // schemePattern defines the regexp pattern for scheme names. @@ -111,7 +113,12 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo if uri == input { // If the value is a single URI, then the return value can be anything. // This is the case `foo: ${file:some_extra_config.yml}`. - expanded, err := mr.expandURI(ctx, input) + ret, err := mr.expandURI(ctx, input) + if err != nil { + return input, false, err + } + + expanded, err := ret.AsRaw() if err != nil { return input, false, err } @@ -121,7 +128,13 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo if err != nil { return input, false, err } - repl, err := toString(expanded) + + var repl string + if internal.StrictlyTypedInputGate.IsEnabled() { + repl, err = expanded.AsString() + } else { + repl, err = toString(expanded) + } if err != nil { return input, false, fmt.Errorf("expanding %v: %w", uri, err) } @@ -129,8 +142,13 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo } // toString attempts to convert input to a string. -func toString(input any) (string, error) { +func toString(ret *Retrieved) (string, error) { // This list must be kept in sync with checkRawConfType. + input, err := ret.AsRaw() + if err != nil { + return "", err + } + val := reflect.ValueOf(input) switch val.Kind() { case reflect.String: @@ -146,7 +164,7 @@ func toString(input any) (string, error) { } } -func (mr *Resolver) expandURI(ctx context.Context, input string) (any, error) { +func (mr *Resolver) expandURI(ctx context.Context, input string) (*Retrieved, error) { // strip ${ and } uri := input[2 : len(input)-1] @@ -167,7 +185,7 @@ func (mr *Resolver) expandURI(ctx context.Context, input string) (any, error) { return nil, err } mr.closers = append(mr.closers, ret.Close) - return ret.AsRaw() + return ret, nil } type location struct { diff --git a/confmap/go.mod b/confmap/go.mod index 7fb8185c539..cbe325bbac2 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -8,6 +8,7 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 github.com/knadh/koanf/v2 v2.1.1 github.com/stretchr/testify v1.9.0 + go.opentelemetry.io/collector/featuregate v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -16,15 +17,15 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/kr/pretty v0.3.1 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rogpeppe/go-internal v1.10.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect ) retract ( v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1 v0.69.0 // Release failed, use v0.69.1 ) + +replace go.opentelemetry.io/collector/featuregate => ../featuregate diff --git a/confmap/go.sum b/confmap/go.sum index c42b46e7c12..5cc7187072e 100644 --- a/confmap/go.sum +++ b/confmap/go.sum @@ -1,29 +1,25 @@ -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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= 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.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod index 7cf6804715a..d6d699d3e33 100644 --- a/confmap/internal/e2e/go.mod +++ b/confmap/internal/e2e/go.mod @@ -7,11 +7,13 @@ require ( go.opentelemetry.io/collector/confmap v0.102.1 go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 + go.opentelemetry.io/collector/featuregate v1.9.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect @@ -28,3 +30,5 @@ replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/confmap/provider/fileprovider => ../../provider/fileprovider replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../provider/envprovider + +replace go.opentelemetry.io/collector/featuregate => ../../../featuregate diff --git a/confmap/internal/e2e/go.sum b/confmap/internal/e2e/go.sum index 1f734bb155a..95211d58154 100644 --- a/confmap/internal/e2e/go.sum +++ b/confmap/internal/e2e/go.sum @@ -2,6 +2,8 @@ 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/go-viper/mapstructure/v2 v2.0.0 h1:dhn8MZ1gZ0mzeodTG3jt5Vj/o87xZKuNAprG2mQfMfc= github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/confmap/internal/e2e/types_test.go b/confmap/internal/e2e/types_test.go index 2c48b73535b..a7d0a6e31ee 100644 --- a/confmap/internal/e2e/types_test.go +++ b/confmap/internal/e2e/types_test.go @@ -11,8 +11,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/internal" "go.opentelemetry.io/collector/confmap/provider/envprovider" "go.opentelemetry.io/collector/confmap/provider/fileprovider" + "go.opentelemetry.io/collector/featuregate" ) type TargetField string @@ -25,10 +27,11 @@ const ( ) type Test struct { - value string - targetField TargetField - expected any - expectedErr string + value string + targetField TargetField + expected any + resolveErr string + unmarshalErr string } type TargetConfig[T any] struct { @@ -37,8 +40,8 @@ type TargetConfig[T any] struct { func AssertExpectedMatch[T any](t *testing.T, tt Test, conf *confmap.Conf, cfg *TargetConfig[T]) { err := conf.Unmarshal(cfg) - if tt.expectedErr != "" { - require.ErrorContains(t, err, tt.expectedErr) + if tt.unmarshalErr != "" { + require.ErrorContains(t, err, tt.unmarshalErr) return } require.NoError(t, err) @@ -166,3 +169,142 @@ func TestTypeCasting(t *testing.T) { }) } } + +func TestStrictTypeCasting(t *testing.T) { + values := []Test{ + { + value: "123", + targetField: TargetFieldInt, + expected: 123, + }, + { + value: "123", + targetField: TargetFieldString, + unmarshalErr: "'field' expected type 'string', got unconvertible type 'int', value: '123'", + }, + { + value: "123", + targetField: TargetFieldInlineString, + expected: "inline field with 123 expansion", + }, + { + value: "0123", + targetField: TargetFieldInt, + expected: 83, + }, + { + value: "0123", + targetField: TargetFieldString, + unmarshalErr: "'field' expected type 'string', got unconvertible type 'int', value: '83'", + }, + { + value: "0123", + targetField: TargetFieldInlineString, + expected: "inline field with 0123 expansion", + }, + { + value: "0xdeadbeef", + targetField: TargetFieldInt, + expected: 3735928559, + }, + { + value: "0xdeadbeef", + targetField: TargetFieldString, + unmarshalErr: "'field' expected type 'string', got unconvertible type 'int', value: '3735928559'", + }, + { + value: "0xdeadbeef", + targetField: TargetFieldInlineString, + expected: "inline field with 0xdeadbeef expansion", + }, + { + value: "\"0123\"", + targetField: TargetFieldString, + expected: "0123", + }, + { + value: "\"0123\"", + targetField: TargetFieldInt, + unmarshalErr: "'field' expected type 'int', got unconvertible type 'string', value: '0123'", + }, + { + value: "\"0123\"", + targetField: TargetFieldInlineString, + expected: "inline field with 0123 expansion", + }, + { + value: "!!str 0123", + targetField: TargetFieldString, + expected: "0123", + }, + { + value: "!!str 0123", + targetField: TargetFieldInlineString, + expected: "inline field with 0123 expansion", + }, + { + value: "t", + targetField: TargetFieldBool, + unmarshalErr: "'field' expected type 'bool', got unconvertible type 'string', value: 't'", + }, + { + value: "23", + targetField: TargetFieldBool, + unmarshalErr: "'field' expected type 'bool', got unconvertible type 'int', value: '23'", + }, + { + value: "{\"field\": 123}", + targetField: TargetFieldInlineString, + resolveErr: "retrieved value does not have unambiguous string representation", + }, + } + + previousValue := internal.StrictlyTypedInputGate.IsEnabled() + err := featuregate.GlobalRegistry().Set(internal.StrictlyTypedInputID, true) + require.NoError(t, err) + defer func() { + err := featuregate.GlobalRegistry().Set(internal.StrictlyTypedInputID, previousValue) + require.NoError(t, err) + }() + + for _, tt := range values { + t.Run(tt.value+"/"+string(tt.targetField), func(t *testing.T) { + testFile := "types_expand.yaml" + if tt.targetField == TargetFieldInlineString { + testFile = "types_expand_inline.yaml" + } + + resolver, err := confmap.NewResolver(confmap.ResolverSettings{ + URIs: []string{filepath.Join("testdata", testFile)}, + ProviderFactories: []confmap.ProviderFactory{ + fileprovider.NewFactory(), + envprovider.NewFactory(), + }, + }) + require.NoError(t, err) + t.Setenv("ENV", tt.value) + + conf, err := resolver.Resolve(context.Background()) + if tt.resolveErr != "" { + require.ErrorContains(t, err, tt.resolveErr) + return + } + require.NoError(t, err) + + switch tt.targetField { + case TargetFieldInt: + var cfg TargetConfig[int] + AssertExpectedMatch(t, tt, conf, &cfg) + case TargetFieldString, TargetFieldInlineString: + var cfg TargetConfig[string] + AssertExpectedMatch(t, tt, conf, &cfg) + case TargetFieldBool: + var cfg TargetConfig[bool] + AssertExpectedMatch(t, tt, conf, &cfg) + default: + t.Fatalf("unexpected target field %q", tt.targetField) + } + + }) + } +} diff --git a/confmap/internal/featuregate.go b/confmap/internal/featuregate.go new file mode 100644 index 00000000000..6e9b9ea8745 --- /dev/null +++ b/confmap/internal/featuregate.go @@ -0,0 +1,14 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package internal // import "go.opentelemetry.io/collector/confmap/internal" + +import "go.opentelemetry.io/collector/featuregate" + +const StrictlyTypedInputID = "confmap.strictlyTypedInput" + +var StrictlyTypedInputGate = featuregate.GlobalRegistry().MustRegister(StrictlyTypedInputID, + featuregate.StageAlpha, + featuregate.WithRegisterFromVersion("v0.103.0"), + featuregate.WithRegisterDescription("Makes type casting rules during configuration unmarshaling stricter. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details."), +) diff --git a/confmap/provider.go b/confmap/provider.go index 192577ed4d8..f774cca3834 100644 --- a/confmap/provider.go +++ b/confmap/provider.go @@ -8,6 +8,7 @@ import ( "fmt" "go.uber.org/zap" + "gopkg.in/yaml.v3" ) // ProviderSettings are the settings to initialize a Provider. @@ -99,10 +100,15 @@ type ChangeEvent struct { type Retrieved struct { rawConf any closeFunc CloseFunc + + stringRepresentation string + isSetString bool } type retrievedSettings struct { - closeFunc CloseFunc + stringRepresentation string + isSetString bool + closeFunc CloseFunc } // RetrievedOption options to customize Retrieved values. @@ -116,6 +122,32 @@ func WithRetrievedClose(closeFunc CloseFunc) RetrievedOption { } } +func withStringRepresentation(stringRepresentation string) RetrievedOption { + return func(settings *retrievedSettings) { + settings.stringRepresentation = stringRepresentation + settings.isSetString = true + } +} + +// NewRetrievedFromYAML returns a new Retrieved instance that contains the deserialized data from the yaml bytes. +// * yamlBytes the yaml bytes that will be deserialized. +// * opts specifies options associated with this Retrieved value, such as CloseFunc. +func NewRetrievedFromYAML(yamlBytes []byte, opts ...RetrievedOption) (*Retrieved, error) { + var rawConf any + if err := yaml.Unmarshal(yamlBytes, &rawConf); err != nil { + return nil, err + } + + switch v := rawConf.(type) { + case string: + opts = append(opts, withStringRepresentation(v)) + case int, int32, int64, float32, float64, bool: + opts = append(opts, withStringRepresentation(string(yamlBytes))) + } + + return NewRetrieved(rawConf, opts...) +} + // NewRetrieved returns a new Retrieved instance that contains the data from the raw deserialized config. // The rawConf can be one of the following types: // - Primitives: int, int32, int64, float32, float64, bool, string; @@ -129,7 +161,12 @@ func NewRetrieved(rawConf any, opts ...RetrievedOption) (*Retrieved, error) { for _, opt := range opts { opt(&set) } - return &Retrieved{rawConf: rawConf, closeFunc: set.closeFunc}, nil + return &Retrieved{ + rawConf: rawConf, + closeFunc: set.closeFunc, + stringRepresentation: set.stringRepresentation, + isSetString: set.isSetString, + }, nil } // AsConf returns the retrieved configuration parsed as a Conf. @@ -152,6 +189,20 @@ func (r *Retrieved) AsRaw() (any, error) { return r.rawConf, nil } +// AsString returns the retrieved configuration as a string. +// If the retrieved configuration is not convertible to a string unambiguously, an error is returned. +// If the retrieved configuration is a string, the string is returned. +// This method is used to resolve ${} references in inline position. +func (r *Retrieved) AsString() (string, error) { + if !r.isSetString { + if str, ok := r.rawConf.(string); ok { + return str, nil + } + return "", fmt.Errorf("retrieved value does not have unambiguous string representation: %v", r.rawConf) + } + return r.stringRepresentation, nil +} + // Close and release any watchers that Provider.Retrieve may have created. // // Should block until all resources are closed, and guarantee that `onChange` is not diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index 8a63caa16aa..00fb83feb8e 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -12,14 +12,18 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) replace go.opentelemetry.io/collector/confmap => ../../ + +replace go.opentelemetry.io/collector/featuregate => ../../../featuregate diff --git a/confmap/provider/envprovider/go.sum b/confmap/provider/envprovider/go.sum index cbad5e85c71..5cc7187072e 100644 --- a/confmap/provider/envprovider/go.sum +++ b/confmap/provider/envprovider/go.sum @@ -2,6 +2,8 @@ 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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/confmap/provider/envprovider/provider.go b/confmap/provider/envprovider/provider.go index 50192b5d994..4db1cb7601a 100644 --- a/confmap/provider/envprovider/provider.go +++ b/confmap/provider/envprovider/provider.go @@ -13,7 +13,6 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/internal/envvar" - "go.opentelemetry.io/collector/confmap/provider/internal" ) const ( @@ -54,7 +53,7 @@ func (emp *provider) Retrieve(_ context.Context, uri string, _ confmap.WatcherFu emp.logger.Info("Configuration references empty environment variable", zap.String("name", envVarName)) } - return internal.NewRetrievedFromYAML([]byte(val)) + return confmap.NewRetrievedFromYAML([]byte(val)) } func (*provider) Scheme() string { diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index 1cd1b19ae89..55878a0b4bd 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -11,15 +11,19 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) replace go.opentelemetry.io/collector/confmap => ../../ + +replace go.opentelemetry.io/collector/featuregate => ../../../featuregate diff --git a/confmap/provider/fileprovider/go.sum b/confmap/provider/fileprovider/go.sum index cbad5e85c71..5cc7187072e 100644 --- a/confmap/provider/fileprovider/go.sum +++ b/confmap/provider/fileprovider/go.sum @@ -2,6 +2,8 @@ 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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/confmap/provider/fileprovider/provider.go b/confmap/provider/fileprovider/provider.go index fe958280cfb..fdd1a8bb380 100644 --- a/confmap/provider/fileprovider/provider.go +++ b/confmap/provider/fileprovider/provider.go @@ -11,7 +11,6 @@ import ( "strings" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/provider/internal" ) const schemeName = "file" @@ -52,7 +51,7 @@ func (fmp *provider) Retrieve(_ context.Context, uri string, _ confmap.WatcherFu return nil, fmt.Errorf("unable to read the file %v: %w", uri, err) } - return internal.NewRetrievedFromYAML(content) + return confmap.NewRetrievedFromYAML(content) } func (*provider) Scheme() string { diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index 98635b9e38a..207a3db8ded 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -11,15 +11,19 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) replace go.opentelemetry.io/collector/confmap => ../../ + +replace go.opentelemetry.io/collector/featuregate => ../../../featuregate diff --git a/confmap/provider/httpprovider/go.sum b/confmap/provider/httpprovider/go.sum index cbad5e85c71..5cc7187072e 100644 --- a/confmap/provider/httpprovider/go.sum +++ b/confmap/provider/httpprovider/go.sum @@ -2,6 +2,8 @@ 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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index db706391d33..d4e06e15241 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -11,15 +11,19 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) replace go.opentelemetry.io/collector/confmap => ../../ + +replace go.opentelemetry.io/collector/featuregate => ../../../featuregate diff --git a/confmap/provider/httpsprovider/go.sum b/confmap/provider/httpsprovider/go.sum index cbad5e85c71..5cc7187072e 100644 --- a/confmap/provider/httpsprovider/go.sum +++ b/confmap/provider/httpsprovider/go.sum @@ -2,6 +2,8 @@ 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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/confmap/provider/internal/configurablehttpprovider/provider.go b/confmap/provider/internal/configurablehttpprovider/provider.go index c683d3d9a4e..f5bac2c6d51 100644 --- a/confmap/provider/internal/configurablehttpprovider/provider.go +++ b/confmap/provider/internal/configurablehttpprovider/provider.go @@ -15,7 +15,6 @@ import ( "strings" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/provider/internal" ) type SchemeType string @@ -109,7 +108,7 @@ func (fmp *provider) Retrieve(_ context.Context, uri string, _ confmap.WatcherFu return nil, fmt.Errorf("fail to read the response body from uri %q: %w", uri, err) } - return internal.NewRetrievedFromYAML(body) + return confmap.NewRetrievedFromYAML(body) } func (fmp *provider) Scheme() string { diff --git a/confmap/provider/internal/provider.go b/confmap/provider/internal/provider.go deleted file mode 100644 index 5a378997529..00000000000 --- a/confmap/provider/internal/provider.go +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package internal // import "go.opentelemetry.io/collector/confmap/provider/internal" - -import ( - "gopkg.in/yaml.v3" - - "go.opentelemetry.io/collector/confmap" -) - -// NewRetrievedFromYAML returns a new Retrieved instance that contains the deserialized data from the yaml bytes. -// * yamlBytes the yaml bytes that will be deserialized. -// * opts specifies options associated with this Retrieved value, such as CloseFunc. -func NewRetrievedFromYAML(yamlBytes []byte, opts ...confmap.RetrievedOption) (*confmap.Retrieved, error) { - var rawConf any - if err := yaml.Unmarshal(yamlBytes, &rawConf); err != nil { - return nil, err - } - return confmap.NewRetrieved(rawConf, opts...) -} diff --git a/confmap/provider/internal/provider_test.go b/confmap/provider/internal/provider_test.go deleted file mode 100644 index 99b0773a015..00000000000 --- a/confmap/provider/internal/provider_test.go +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package internal - -import ( - "context" - "errors" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "go.opentelemetry.io/collector/confmap" -) - -func TestNewRetrievedFromYAML(t *testing.T) { - ret, err := NewRetrievedFromYAML([]byte{}) - require.NoError(t, err) - retMap, err := ret.AsConf() - require.NoError(t, err) - assert.Equal(t, confmap.New(), retMap) - assert.NoError(t, ret.Close(context.Background())) -} - -func TestNewRetrievedFromYAMLWithOptions(t *testing.T) { - want := errors.New("my error") - ret, err := NewRetrievedFromYAML([]byte{}, confmap.WithRetrievedClose(func(context.Context) error { return want })) - require.NoError(t, err) - retMap, err := ret.AsConf() - require.NoError(t, err) - assert.Equal(t, confmap.New(), retMap) - assert.Equal(t, want, ret.Close(context.Background())) -} - -func TestNewRetrievedFromYAMLInvalidYAMLBytes(t *testing.T) { - _, err := NewRetrievedFromYAML([]byte("[invalid:,")) - assert.Error(t, err) -} - -func TestNewRetrievedFromYAMLInvalidAsMap(t *testing.T) { - ret, err := NewRetrievedFromYAML([]byte("string")) - require.NoError(t, err) - - _, err = ret.AsConf() - assert.Error(t, err) -} diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index 0c95589e241..c16458191d6 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -11,15 +11,19 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) replace go.opentelemetry.io/collector/confmap => ../../ + +replace go.opentelemetry.io/collector/featuregate => ../../../featuregate diff --git a/confmap/provider/yamlprovider/go.sum b/confmap/provider/yamlprovider/go.sum index cbad5e85c71..5cc7187072e 100644 --- a/confmap/provider/yamlprovider/go.sum +++ b/confmap/provider/yamlprovider/go.sum @@ -2,6 +2,8 @@ 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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/confmap/provider/yamlprovider/provider.go b/confmap/provider/yamlprovider/provider.go index 949fc71bf7d..723643d3056 100644 --- a/confmap/provider/yamlprovider/provider.go +++ b/confmap/provider/yamlprovider/provider.go @@ -9,7 +9,6 @@ import ( "strings" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/provider/internal" ) const schemeName = "yaml" @@ -38,7 +37,7 @@ func (s *provider) Retrieve(_ context.Context, uri string, _ confmap.WatcherFunc return nil, fmt.Errorf("%q uri is not supported by %q provider", uri, schemeName) } - return internal.NewRetrievedFromYAML([]byte(uri[len(schemeName)+1:])) + return confmap.NewRetrievedFromYAML([]byte(uri[len(schemeName)+1:])) } func (*provider) Scheme() string { diff --git a/confmap/provider_test.go b/confmap/provider_test.go index e57e9748274..e43b5608096 100644 --- a/confmap/provider_test.go +++ b/confmap/provider_test.go @@ -35,3 +35,112 @@ func TestNewRetrievedUnsupportedType(t *testing.T) { _, err := NewRetrieved(errors.New("my error")) require.Error(t, err) } + +func TestNewRetrievedFromYAML(t *testing.T) { + ret, err := NewRetrievedFromYAML([]byte{}) + require.NoError(t, err) + retMap, err := ret.AsConf() + require.NoError(t, err) + assert.Equal(t, New(), retMap) + assert.NoError(t, ret.Close(context.Background())) +} + +func TestNewRetrievedFromYAMLWithOptions(t *testing.T) { + want := errors.New("my error") + ret, err := NewRetrievedFromYAML([]byte{}, WithRetrievedClose(func(context.Context) error { return want })) + require.NoError(t, err) + retMap, err := ret.AsConf() + require.NoError(t, err) + assert.Equal(t, New(), retMap) + assert.Equal(t, want, ret.Close(context.Background())) +} + +func TestNewRetrievedFromYAMLInvalidYAMLBytes(t *testing.T) { + _, err := NewRetrievedFromYAML([]byte("[invalid:,")) + assert.Error(t, err) +} + +func TestNewRetrievedFromYAMLInvalidAsMap(t *testing.T) { + ret, err := NewRetrievedFromYAML([]byte("string")) + require.NoError(t, err) + + _, err = ret.AsConf() + assert.Error(t, err) + + str, err := ret.AsString() + require.NoError(t, err) + assert.Equal(t, "string", str) +} + +func TestNewRetrievedFromYAMLString(t *testing.T) { + tests := []struct { + yaml string + value any + altStrRepr string + strReprErr string + }{ + { + yaml: "string", + value: "string", + }, + { + yaml: "\"string\"", + value: "string", + altStrRepr: "string", + }, + { + yaml: "123", + value: 123, + }, + { + yaml: "true", + value: true, + }, + { + yaml: "0123", + value: 0o123, + }, + { + yaml: "0x123", + value: 0x123, + }, + { + yaml: "0b101", + value: 0b101, + }, + { + yaml: "0.123", + value: 0.123, + }, + { + yaml: "{key: value}", + value: map[string]any{"key": "value"}, + strReprErr: "retrieved value does not have unambiguous string representation", + }, + } + + for _, tt := range tests { + t.Run(tt.yaml, func(t *testing.T) { + ret, err := NewRetrievedFromYAML([]byte(tt.yaml)) + require.NoError(t, err) + + raw, err := ret.AsRaw() + require.NoError(t, err) + assert.Equal(t, tt.value, raw) + + str, err := ret.AsString() + if tt.strReprErr != "" { + assert.ErrorContains(t, err, tt.strReprErr) + return + } + require.NoError(t, err) + + if tt.altStrRepr != "" { + assert.Equal(t, tt.altStrRepr, str) + } else { + assert.Equal(t, tt.yaml, str) + } + }) + } + +} diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 26d57de278a..d634948cd5e 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -21,6 +21,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -36,6 +37,7 @@ require ( github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector v0.102.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index 546bbb07b0c..19b9e6a7e6d 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -19,6 +19,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 377583db731..6d83ea5eb5b 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -25,6 +25,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -41,6 +42,7 @@ require ( go.opentelemetry.io/collector v0.102.1 // indirect go.opentelemetry.io/collector/config/configretry v0.102.1 // indirect go.opentelemetry.io/collector/extension v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/receiver v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index 84344402540..6b5766f0e92 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/exporter/go.mod b/exporter/go.mod index 8991711f47b..16060bb22e3 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -35,6 +35,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -49,6 +50,7 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/confmap v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/text v0.15.0 // indirect diff --git a/exporter/go.sum b/exporter/go.sum index 84344402540..6b5766f0e92 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 29f9a48c551..9e32d8fd62d 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -41,6 +42,7 @@ require ( go.opentelemetry.io/collector/config/configretry v0.102.1 // indirect go.opentelemetry.io/collector/consumer v0.102.1 // indirect go.opentelemetry.io/collector/extension v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/receiver v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 84344402540..6b5766f0e92 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index 13509110eec..332b0e0a3a8 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -21,6 +21,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -35,6 +36,7 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/receiver v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index 84344402540..6b5766f0e92 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 3cf28c7d313..b3fc8893e9c 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -18,6 +18,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect @@ -30,6 +31,7 @@ require ( github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/collector/confmap v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect @@ -56,3 +58,5 @@ replace go.opentelemetry.io/collector/extension => ../ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/extension/auth/go.sum b/extension/auth/go.sum index fccc711bc09..cf7efb1c39a 100644 --- a/extension/auth/go.sum +++ b/extension/auth/go.sum @@ -15,6 +15,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 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/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index ced6dd46d5a..f5bc31e0b6c 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -23,6 +23,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect @@ -40,6 +41,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index 1650970f7f5..f8c64190fc5 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -20,6 +20,8 @@ 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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= diff --git a/extension/go.mod b/extension/go.mod index dbd1c36466f..311d2ffa1e7 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -18,6 +18,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect @@ -29,6 +30,7 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect @@ -54,3 +56,5 @@ replace go.opentelemetry.io/collector/confmap => ../confmap replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry + +replace go.opentelemetry.io/collector/featuregate => ../featuregate diff --git a/extension/go.sum b/extension/go.sum index 4f000f30f43..7d70b077386 100644 --- a/extension/go.sum +++ b/extension/go.sum @@ -17,6 +17,8 @@ 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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= diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 80af7eb38be..4d0066d0d9b 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -22,6 +22,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect @@ -39,6 +40,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index 1650970f7f5..f8c64190fc5 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -20,6 +20,8 @@ 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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= diff --git a/filter/go.mod b/filter/go.mod index 8a3011a69cb..8f6a832124b 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -10,15 +10,19 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect 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.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) replace go.opentelemetry.io/collector/confmap => ../confmap + +replace go.opentelemetry.io/collector/featuregate => ../featuregate diff --git a/filter/go.sum b/filter/go.sum index cbad5e85c71..5cc7187072e 100644 --- a/filter/go.sum +++ b/filter/go.sum @@ -2,6 +2,8 @@ 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/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 2309194d06f..3704115adb8 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -29,6 +29,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -42,6 +43,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index 546bbb07b0c..19b9e6a7e6d 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -19,6 +19,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 8ebdbe38b0c..ac8be13d419 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -23,6 +23,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -43,6 +44,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.102.1 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 009467e0b8b..8974877be3f 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index b385a695a65..f41e8a00402 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -20,6 +20,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -34,6 +35,7 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/featuregate v1.9.0 // indirect go.opentelemetry.io/collector/pdata v1.9.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect diff --git a/receiver/nopreceiver/go.sum b/receiver/nopreceiver/go.sum index 546bbb07b0c..19b9e6a7e6d 100644 --- a/receiver/nopreceiver/go.sum +++ b/receiver/nopreceiver/go.sum @@ -19,6 +19,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= From 654cb24073c7edc2d68038cd5f1c3f1b3af611f2 Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Mon, 17 Jun 2024 11:02:44 -0500 Subject: [PATCH 081/168] Add ability to marshal yaml-tagged structs (#10282) Possible solution for https://github.com/open-telemetry/opentelemetry-collector/pull/10139#issuecomment-2117559390 More thorough explanation here: https://github.com/open-telemetry/opentelemetry-collector/pull/10139#issuecomment-2142728782 --------- Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> --- .chloggen/yaml-hook.yaml | 25 +++++ confmap/confmap.go | 1 + confmap/internal/mapstructure/encoder.go | 33 +++++++ confmap/internal/mapstructure/encoder_test.go | 91 ++++++++++++++++--- 4 files changed, 138 insertions(+), 12 deletions(-) create mode 100644 .chloggen/yaml-hook.yaml diff --git a/.chloggen/yaml-hook.yaml b/.chloggen/yaml-hook.yaml new file mode 100644 index 00000000000..8d59edb27ad --- /dev/null +++ b/.chloggen/yaml-hook.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confmap + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix issue where structs with only yaml tags were not marshaled correctly. + +# One or more tracking issues or pull requests related to the change +issues: [10282] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/confmap/confmap.go b/confmap/confmap.go index 39bbc53cc33..f24d12de17f 100644 --- a/confmap/confmap.go +++ b/confmap/confmap.go @@ -192,6 +192,7 @@ func decodeConfig(m *Conf, result any, errorUnused bool, skipTopLevelUnmarshaler func encoderConfig(rawVal any) *encoder.EncoderConfig { return &encoder.EncoderConfig{ EncodeHook: mapstructure.ComposeDecodeHookFunc( + encoder.YamlMarshalerHookFunc(), encoder.TextMarshalerHookFunc(), marshalerHookFunc(rawVal), ), diff --git a/confmap/internal/mapstructure/encoder.go b/confmap/internal/mapstructure/encoder.go index d0e222e08b6..994ad038fd3 100644 --- a/confmap/internal/mapstructure/encoder.go +++ b/confmap/internal/mapstructure/encoder.go @@ -11,6 +11,7 @@ import ( "strings" "github.com/go-viper/mapstructure/v2" + "gopkg.in/yaml.v3" ) const ( @@ -228,3 +229,35 @@ func TextMarshalerHookFunc() mapstructure.DecodeHookFuncValue { return string(out), nil } } + +// YamlMarshalerHookFunc returns a DecodeHookFuncValue that checks for structs +// that have yaml tags but no mapstructure tags. If found, it will convert the struct +// to map[string]any using the yaml package, which respects the yaml tags. Ultimately, +// this allows mapstructure to later marshal the map[string]any in a generic way. +func YamlMarshalerHookFunc() mapstructure.DecodeHookFuncValue { + return func(from reflect.Value, _ reflect.Value) (any, error) { + if from.Kind() == reflect.Struct { + for i := 0; i < from.NumField(); i++ { + if _, ok := from.Type().Field(i).Tag.Lookup("mapstructure"); ok { + // The struct has at least one mapstructure tag so don't do anything. + return from.Interface(), nil + } + + if _, ok := from.Type().Field(i).Tag.Lookup("yaml"); ok { + // The struct has at least one yaml tag, so convert it to map[string]any using yaml. + yamlBytes, err := yaml.Marshal(from.Interface()) + if err != nil { + return nil, err + } + var m map[string]any + err = yaml.Unmarshal(yamlBytes, &m) + if err != nil { + return nil, err + } + return m, nil + } + } + } + return from.Interface(), nil + } +} diff --git a/confmap/internal/mapstructure/encoder_test.go b/confmap/internal/mapstructure/encoder_test.go index 54800e7a740..a0cdb75fb75 100644 --- a/confmap/internal/mapstructure/encoder_test.go +++ b/confmap/internal/mapstructure/encoder_test.go @@ -15,13 +15,17 @@ import ( ) type TestComplexStruct struct { - Skipped TestEmptyStruct `mapstructure:",squash"` - Nested TestSimpleStruct `mapstructure:",squash"` - Slice []TestSimpleStruct `mapstructure:"slice,omitempty"` - Pointer *TestSimpleStruct `mapstructure:"ptr"` - Map map[string]TestSimpleStruct `mapstructure:"map,omitempty"` - Remain map[string]any `mapstructure:",remain"` - Interface encoding.TextMarshaler + Skipped TestEmptyStruct `mapstructure:",squash"` + Nested TestSimpleStruct `mapstructure:",squash"` + Slice []TestSimpleStruct `mapstructure:"slice,omitempty"` + Pointer *TestSimpleStruct `mapstructure:"ptr"` + Map map[string]TestSimpleStruct `mapstructure:"map,omitempty"` + Remain map[string]any `mapstructure:",remain"` + TranslatedYaml TestYamlStruct `mapstructure:"translated"` + SquashedYaml TestYamlStruct `mapstructure:",squash"` + PointerTranslatedYaml *TestPtrToYamlStruct `mapstructure:"translated_ptr"` + PointerSquashedYaml *TestPtrToYamlStruct `mapstructure:",squash"` + Interface encoding.TextMarshaler } type TestSimpleStruct struct { @@ -34,6 +38,26 @@ type TestEmptyStruct struct { Value string `mapstructure:"-"` } +type TestYamlStruct struct { + YamlValue string `yaml:"yaml_value"` + YamlOmitEmpty string `yaml:"yaml_omit,omitempty"` + YamlInline TestYamlSimpleStruct `yaml:",inline"` +} + +type TestPtrToYamlStruct struct { + YamlValue string `yaml:"yaml_value_ptr"` + YamlOmitEmpty string `yaml:"yaml_omit_ptr,omitempty"` + YamlInline *TestYamlPtrToSimpleStruct `yaml:",inline"` +} + +type TestYamlSimpleStruct struct { + Inline string `yaml:"yaml_inline"` +} + +type TestYamlPtrToSimpleStruct struct { + InlinePtr string `yaml:"yaml_inline_ptr"` +} + type TestID string func (tID TestID) MarshalText() (text []byte, err error) { @@ -51,7 +75,10 @@ type TestStringLike string func TestEncode(t *testing.T) { enc := New(&EncoderConfig{ - EncodeHook: TextMarshalerHookFunc(), + EncodeHook: mapstructure.ComposeDecodeHookFunc( + YamlMarshalerHookFunc(), + TextMarshalerHookFunc(), + ), }) testCases := map[string]struct { input any @@ -116,6 +143,34 @@ func TestEncode(t *testing.T) { "remain2": "value", }, Interface: TestID("value"), + TranslatedYaml: TestYamlStruct{ + YamlValue: "foo_translated", + YamlOmitEmpty: "", + YamlInline: TestYamlSimpleStruct{ + Inline: "bar_translated", + }, + }, + SquashedYaml: TestYamlStruct{ + YamlValue: "foo_squashed", + YamlOmitEmpty: "", + YamlInline: TestYamlSimpleStruct{ + Inline: "bar_squashed", + }, + }, + PointerTranslatedYaml: &TestPtrToYamlStruct{ + YamlValue: "foo_translated_ptr", + YamlOmitEmpty: "", + YamlInline: &TestYamlPtrToSimpleStruct{ + InlinePtr: "bar_translated_ptr", + }, + }, + PointerSquashedYaml: &TestPtrToYamlStruct{ + YamlValue: "foo_squashed_ptr", + YamlOmitEmpty: "", + YamlInline: &TestYamlPtrToSimpleStruct{ + InlinePtr: "bar_squashed_ptr", + }, + }, }, want: map[string]any{ "value": "nested", @@ -123,10 +178,22 @@ func TestEncode(t *testing.T) { "map": map[string]any{ "Key": map[string]any{"value": "map"}, }, - "ptr": map[string]any{"value": "pointer"}, - "interface": "value_", - "remain1": 23, - "remain2": "value", + "ptr": map[string]any{"value": "pointer"}, + "interface": "value_", + "yaml_value": "foo_squashed", + "yaml_inline": "bar_squashed", + "translated": map[string]any{ + "yaml_value": "foo_translated", + "yaml_inline": "bar_translated", + }, + "yaml_value_ptr": "foo_squashed_ptr", + "yaml_inline_ptr": "bar_squashed_ptr", + "translated_ptr": map[string]any{ + "yaml_value_ptr": "foo_translated_ptr", + "yaml_inline_ptr": "bar_translated_ptr", + }, + "remain1": 23, + "remain2": "value", }, }, } From f88ce7a687ba905d30d9874e7ced85726daef062 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:52:52 -0700 Subject: [PATCH 082/168] [chore] more CreateSettings renames (#10416) This only impacts internal code, no external impact. Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- service/telemetry/internal/factory.go | 16 ++++++++-------- service/telemetry/telemetry.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/service/telemetry/internal/factory.go b/service/telemetry/internal/factory.go index f1368c9704d..9afd6bd06c3 100644 --- a/service/telemetry/internal/factory.go +++ b/service/telemetry/internal/factory.go @@ -13,8 +13,8 @@ import ( "go.opentelemetry.io/collector/component" ) -// CreateSettings holds configuration for building Telemetry. -type CreateSettings struct { +// Settings holds configuration for building Telemetry. +type Settings struct { BuildInfo component.BuildInfo AsyncErrorChannel chan error ZapOptions []zap.Option @@ -29,10 +29,10 @@ type Factory interface { CreateDefaultConfig() component.Config // CreateLogger creates a logger. - CreateLogger(ctx context.Context, set CreateSettings, cfg component.Config) (*zap.Logger, error) + CreateLogger(ctx context.Context, set Settings, cfg component.Config) (*zap.Logger, error) // CreateTracerProvider creates a TracerProvider. - CreateTracerProvider(ctx context.Context, set CreateSettings, cfg component.Config) (trace.TracerProvider, error) + CreateTracerProvider(ctx context.Context, set Settings, cfg component.Config) (trace.TracerProvider, error) // TODO: Add CreateMeterProvider. @@ -69,7 +69,7 @@ func (f *factory) CreateDefaultConfig() component.Config { } // CreateLoggerFunc is the equivalent of Factory.CreateLogger. -type CreateLoggerFunc func(context.Context, CreateSettings, component.Config) (*zap.Logger, error) +type CreateLoggerFunc func(context.Context, Settings, component.Config) (*zap.Logger, error) // WithLogger overrides the default no-op logger. func WithLogger(createLogger CreateLoggerFunc) FactoryOption { @@ -78,7 +78,7 @@ func WithLogger(createLogger CreateLoggerFunc) FactoryOption { }) } -func (f *factory) CreateLogger(ctx context.Context, set CreateSettings, cfg component.Config) (*zap.Logger, error) { +func (f *factory) CreateLogger(ctx context.Context, set Settings, cfg component.Config) (*zap.Logger, error) { if f.CreateLoggerFunc == nil { return zap.NewNop(), nil } @@ -86,7 +86,7 @@ func (f *factory) CreateLogger(ctx context.Context, set CreateSettings, cfg comp } // CreateTracerProviderFunc is the equivalent of Factory.CreateTracerProvider. -type CreateTracerProviderFunc func(context.Context, CreateSettings, component.Config) (trace.TracerProvider, error) +type CreateTracerProviderFunc func(context.Context, Settings, component.Config) (trace.TracerProvider, error) // WithTracerProvider overrides the default no-op tracer provider. func WithTracerProvider(createTracerProvider CreateTracerProviderFunc) FactoryOption { @@ -95,7 +95,7 @@ func WithTracerProvider(createTracerProvider CreateTracerProviderFunc) FactoryOp }) } -func (f *factory) CreateTracerProvider(ctx context.Context, set CreateSettings, cfg component.Config) (trace.TracerProvider, error) { +func (f *factory) CreateTracerProvider(ctx context.Context, set Settings, cfg component.Config) (trace.TracerProvider, error) { if f.CreateTracerProviderFunc == nil { return tracenoop.NewTracerProvider(), nil } diff --git a/service/telemetry/telemetry.go b/service/telemetry/telemetry.go index c9346c26d59..8ca29332924 100644 --- a/service/telemetry/telemetry.go +++ b/service/telemetry/telemetry.go @@ -8,4 +8,4 @@ import ( ) // Settings holds configuration for building Telemetry. -type Settings = internal.CreateSettings +type Settings = internal.Settings From aa31b271c61fa95dfef53a76f538348c7e6cb048 Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 17 Jun 2024 22:53:27 +0200 Subject: [PATCH 083/168] [chore] Prepare release v1.10.0/v0.103.0 (#10418) The following commands were run to prepare this release: - make chlog-update VERSION=v1.10.0/v0.103.0 - make prepare-release PREVIOUS_VERSION=1.9.0 RELEASE_CANDIDATE=1.10.0 MODSET=stable - make prepare-release PREVIOUS_VERSION=0.102.1 RELEASE_CANDIDATE=0.103.0 MODSET=beta --- .../batchseder-fix-potential-deadlock.yaml | 19 ---- .../builder-configure-default-scheme.yaml | 25 ------ .../codeboten_create-settings-connector.yaml | 28 ------ .../codeboten_create-settings-exporter.yaml | 28 ------ .../codeboten_create-settings-extension.yaml | 28 ------ .../codeboten_create-settings-processor.yaml | 28 ------ .../codeboten_create-settings-receiver.yaml | 28 ------ .../codeboten_optional-internal-metric.yaml | 25 ------ ...onfigauth-add-context-to-public-funcs.yaml | 25 ------ .chloggen/confighttp-customroundtripper.yaml | 25 ------ .../confmap-add-expand-featuregate-3.yaml | 29 ------ .chloggen/confmap-add-expand-featuregate.yaml | 29 ------ .chloggen/confmap-fix-log.yaml | 25 ------ .../debug-exporter-disable-sampling.yaml | 25 ------ .chloggen/filter.yaml | 25 ------ .chloggen/fix_batch_sender_chaining.yaml | 20 ----- .chloggen/fix_batch_sender_shutdown.yaml | 20 ----- .chloggen/fix_batch_sender_small_batch.yaml | 20 ----- ...low-compression-list-to-be-overridden.yaml | 18 ---- .chloggen/jpkroehling_revert-zstd.yaml | 25 ------ .chloggen/mx-psi_asstring.yaml | 25 ------ .chloggen/mx-psi_newretrievedfromyaml.yaml | 25 ------ .chloggen/mx-psi_weaklytypedinput.yaml | 28 ------ ...elcol-default-providers-featuregate-2.yaml | 25 ------ ...otelcol-default-providers-featuregate.yaml | 25 ------ .chloggen/remove_unmarshalconfig.yaml | 25 ------ .chloggen/yaml-hook.yaml | 25 ------ .../zpagesextension_confighttp-user.yaml | 25 ------ .chloggen/zpagesextension_confighttp.yaml | 25 ------ CHANGELOG-API.md | 46 ++++++++++ CHANGELOG.md | 43 +++++++++ cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 51 ++++++----- cmd/builder/test/core.builder.yaml | 8 +- cmd/mdatagen/go.mod | 20 ++--- cmd/otelcorecol/builder-config.yaml | 40 ++++----- cmd/otelcorecol/go.mod | 88 +++++++++---------- cmd/otelcorecol/main.go | 2 +- component/go.mod | 4 +- config/configauth/go.mod | 14 +-- config/configgrpc/go.mod | 30 +++---- config/confighttp/go.mod | 26 +++--- config/configtls/go.mod | 2 +- config/internal/go.mod | 4 +- confmap/converter/expandconverter/go.mod | 6 +- confmap/go.mod | 2 +- confmap/internal/e2e/go.mod | 4 +- confmap/provider/envprovider/go.mod | 4 +- confmap/provider/fileprovider/go.mod | 4 +- confmap/provider/httpprovider/go.mod | 4 +- confmap/provider/httpsprovider/go.mod | 4 +- confmap/provider/yamlprovider/go.mod | 4 +- connector/forwardconnector/go.mod | 16 ++-- connector/go.mod | 12 +-- consumer/go.mod | 4 +- exporter/debugexporter/go.mod | 24 ++--- exporter/go.mod | 22 ++--- exporter/loggingexporter/go.mod | 22 ++--- exporter/nopexporter/go.mod | 16 ++-- exporter/otlpexporter/go.mod | 40 ++++----- exporter/otlphttpexporter/go.mod | 36 ++++---- extension/auth/go.mod | 12 +-- extension/ballastextension/go.mod | 14 +-- extension/go.mod | 10 +-- extension/memorylimiterextension/go.mod | 14 +-- extension/zpagesextension/go.mod | 28 +++--- filter/go.mod | 4 +- go.mod | 14 +-- internal/e2e/go.mod | 42 ++++----- otelcol/go.mod | 42 ++++----- pdata/pprofile/go.mod | 2 +- pdata/testdata/go.mod | 2 +- processor/batchprocessor/go.mod | 18 ++-- processor/go.mod | 12 +-- processor/memorylimiterprocessor/go.mod | 18 ++-- receiver/go.mod | 10 +-- receiver/nopreceiver/go.mod | 14 +-- receiver/otlpreceiver/go.mod | 38 ++++---- service/go.mod | 44 +++++----- versions.yaml | 4 +- 80 files changed, 520 insertions(+), 1149 deletions(-) delete mode 100644 .chloggen/batchseder-fix-potential-deadlock.yaml delete mode 100644 .chloggen/builder-configure-default-scheme.yaml delete mode 100644 .chloggen/codeboten_create-settings-connector.yaml delete mode 100644 .chloggen/codeboten_create-settings-exporter.yaml delete mode 100644 .chloggen/codeboten_create-settings-extension.yaml delete mode 100644 .chloggen/codeboten_create-settings-processor.yaml delete mode 100644 .chloggen/codeboten_create-settings-receiver.yaml delete mode 100644 .chloggen/codeboten_optional-internal-metric.yaml delete mode 100644 .chloggen/configauth-add-context-to-public-funcs.yaml delete mode 100644 .chloggen/confighttp-customroundtripper.yaml delete mode 100644 .chloggen/confmap-add-expand-featuregate-3.yaml delete mode 100644 .chloggen/confmap-add-expand-featuregate.yaml delete mode 100644 .chloggen/confmap-fix-log.yaml delete mode 100644 .chloggen/debug-exporter-disable-sampling.yaml delete mode 100644 .chloggen/filter.yaml delete mode 100644 .chloggen/fix_batch_sender_chaining.yaml delete mode 100644 .chloggen/fix_batch_sender_shutdown.yaml delete mode 100644 .chloggen/fix_batch_sender_small_batch.yaml delete mode 100644 .chloggen/jpkroehling_allow-compression-list-to-be-overridden.yaml delete mode 100644 .chloggen/jpkroehling_revert-zstd.yaml delete mode 100644 .chloggen/mx-psi_asstring.yaml delete mode 100644 .chloggen/mx-psi_newretrievedfromyaml.yaml delete mode 100644 .chloggen/mx-psi_weaklytypedinput.yaml delete mode 100644 .chloggen/otelcol-default-providers-featuregate-2.yaml delete mode 100644 .chloggen/otelcol-default-providers-featuregate.yaml delete mode 100644 .chloggen/remove_unmarshalconfig.yaml delete mode 100644 .chloggen/yaml-hook.yaml delete mode 100644 .chloggen/zpagesextension_confighttp-user.yaml delete mode 100644 .chloggen/zpagesextension_confighttp.yaml diff --git a/.chloggen/batchseder-fix-potential-deadlock.yaml b/.chloggen/batchseder-fix-potential-deadlock.yaml deleted file mode 100644 index d3b89737775..00000000000 --- a/.chloggen/batchseder-fix-potential-deadlock.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix potential deadlock in the batch sender - -# One or more tracking issues or pull requests related to the change -issues: [10315] - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -change_logs: [user] diff --git a/.chloggen/builder-configure-default-scheme.yaml b/.chloggen/builder-configure-default-scheme.yaml deleted file mode 100644 index 283d8f8290b..00000000000 --- a/.chloggen/builder-configure-default-scheme.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: cmd/builder - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Allow setting `otelcol.CollectorSettings.ResolverSettings.DefaultScheme` via the builder's `conf_resolver.default_uri_scheme` configuration option - -# One or more tracking issues or pull requests related to the change -issues: [10296] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/codeboten_create-settings-connector.yaml b/.chloggen/codeboten_create-settings-connector.yaml deleted file mode 100644 index 708df0cf6df..00000000000 --- a/.chloggen/codeboten_create-settings-connector.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: connector - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate CreateSettings and NewNopCreateSettings - -# One or more tracking issues or pull requests related to the change -issues: [9428] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - The following methods are being renamed: - - connector.CreateSettings -> connector.Settings - - connector.NewNopCreateSettings -> connector.NewNopSettings - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/codeboten_create-settings-exporter.yaml b/.chloggen/codeboten_create-settings-exporter.yaml deleted file mode 100644 index 7d444e36b09..00000000000 --- a/.chloggen/codeboten_create-settings-exporter.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate CreateSettings and NewNopCreateSettings - -# One or more tracking issues or pull requests related to the change -issues: [9428] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - The following methods are being renamed: - - exporter.CreateSettings -> exporter.Settings - - exporter.NewNopCreateSettings -> exporter.NewNopSettings - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/codeboten_create-settings-extension.yaml b/.chloggen/codeboten_create-settings-extension.yaml deleted file mode 100644 index e882d026ab1..00000000000 --- a/.chloggen/codeboten_create-settings-extension.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: extension - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate CreateSettings and NewNopCreateSettings - -# One or more tracking issues or pull requests related to the change -issues: [9428] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - The following methods are being renamed: - - extension.CreateSettings -> extension.Settings - - extension.NewNopCreateSettings -> extension.NewNopSettings - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/codeboten_create-settings-processor.yaml b/.chloggen/codeboten_create-settings-processor.yaml deleted file mode 100644 index 6d4ec095c26..00000000000 --- a/.chloggen/codeboten_create-settings-processor.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: processor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate CreateSettings and NewNopCreateSettings - -# One or more tracking issues or pull requests related to the change -issues: [9428] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - The following methods are being renamed: - - processor.CreateSettings -> processor.Settings - - processor.NewNopCreateSettings -> processor.NewNopSettings - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/codeboten_create-settings-receiver.yaml b/.chloggen/codeboten_create-settings-receiver.yaml deleted file mode 100644 index 9afcb42c231..00000000000 --- a/.chloggen/codeboten_create-settings-receiver.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: receiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate CreateSettings and NewNopCreateSettings - -# One or more tracking issues or pull requests related to the change -issues: [9428] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - The following methods are being renamed: - - receiver.CreateSettings -> receiver.Settings - - receiver.NewNopCreateSettings -> receiver.NewNopSettings - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/codeboten_optional-internal-metric.yaml b/.chloggen/codeboten_optional-internal-metric.yaml deleted file mode 100644 index ed776cd9519..00000000000 --- a/.chloggen/codeboten_optional-internal-metric.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: add support for optional internal metrics - -# One or more tracking issues or pull requests related to the change -issues: [10316] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/configauth-add-context-to-public-funcs.yaml b/.chloggen/configauth-add-context-to-public-funcs.yaml deleted file mode 100644 index 01589081b0d..00000000000 --- a/.chloggen/configauth-add-context-to-public-funcs.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: configauth - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate `GetClientAuthenticator` and `GetServerAuthenticator`, use `GetClientAuthenticatorContext` and `GetServerAuthenticatorContext` instead. - -# One or more tracking issues or pull requests related to the change -issues: [9808] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] \ No newline at end of file diff --git a/.chloggen/confighttp-customroundtripper.yaml b/.chloggen/confighttp-customroundtripper.yaml deleted file mode 100644 index 79076c0733d..00000000000 --- a/.chloggen/confighttp-customroundtripper.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate `ClientConfig.CustomRoundTripper` - -# One or more tracking issues or pull requests related to the change -issues: [8627] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: Set the `Transport` field on the `*http.Client` object returned from `(ClientConfig).ToClient` instead. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/confmap-add-expand-featuregate-3.yaml b/.chloggen/confmap-add-expand-featuregate-3.yaml deleted file mode 100644 index 98d2f8741df..00000000000 --- a/.chloggen/confmap-add-expand-featuregate-3.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcol/expandconverter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add `confmap.unifyEnvVarExpansion` feature gate to allow enabling Collector/Configuration SIG environment variable expansion rules. - -# One or more tracking issues or pull requests related to the change -issues: [10391] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - When enabled, this feature gate will: - - Disable expansion of BASH-style env vars (`$FOO`) - - `${FOO}` will be expanded as if it was `${env:FOO} - See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/confmap-add-expand-featuregate.yaml b/.chloggen/confmap-add-expand-featuregate.yaml deleted file mode 100644 index d372c39c4bb..00000000000 --- a/.chloggen/confmap-add-expand-featuregate.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confmap - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add `confmap.unifyEnvVarExpansion` feature gate to allow enabling Collector/Configuration SIG environment variable expansion rules. - -# One or more tracking issues or pull requests related to the change -issues: [10259] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - When enabled, this feature gate will: - - Disable expansion of BASH-style env vars (`$FOO`) - - `${FOO}` will be expanded as if it was `${env:FOO} - See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/confmap-fix-log.yaml b/.chloggen/confmap-fix-log.yaml deleted file mode 100644 index dadb11ca31f..00000000000 --- a/.chloggen/confmap-fix-log.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: expandconverter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix bug where an warning was logged incorrectly. - -# One or more tracking issues or pull requests related to the change -issues: [10392] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/debug-exporter-disable-sampling.yaml b/.chloggen/debug-exporter-disable-sampling.yaml deleted file mode 100644 index fa45ec9ab5a..00000000000 --- a/.chloggen/debug-exporter-disable-sampling.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporter/debug - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Disable sampling by default - -# One or more tracking issues or pull requests related to the change -issues: [9921] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: To restore the behavior that was previously the default, set `sampling_thereafter` to `500`. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/filter.yaml b/.chloggen/filter.yaml deleted file mode 100644 index 4006aa43af1..00000000000 --- a/.chloggen/filter.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: filter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate the `filter.CombinedFilter` struct - -# One or more tracking issues or pull requests related to the change -issues: [10348] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/fix_batch_sender_chaining.yaml b/.chloggen/fix_batch_sender_chaining.yaml deleted file mode 100644 index 55dece860fc..00000000000 --- a/.chloggen/fix_batch_sender_chaining.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix a bug when the retry and timeout logic was not applied with enabled batching. - -# One or more tracking issues or pull requests related to the change -issues: [10166] - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/fix_batch_sender_shutdown.yaml b/.chloggen/fix_batch_sender_shutdown.yaml deleted file mode 100644 index 36d4f71cb01..00000000000 --- a/.chloggen/fix_batch_sender_shutdown.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix a bug where an unstarted batch_sender exporter hangs on shutdown - -# One or more tracking issues or pull requests related to the change -issues: [10306] - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/fix_batch_sender_small_batch.yaml b/.chloggen/fix_batch_sender_small_batch.yaml deleted file mode 100644 index fedb8f3a867..00000000000 --- a/.chloggen/fix_batch_sender_small_batch.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix small batch due to unfavorable goroutine scheduling in batch sender - -# One or more tracking issues or pull requests related to the change -issues: [9952] - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/jpkroehling_allow-compression-list-to-be-overridden.yaml b/.chloggen/jpkroehling_allow-compression-list-to-be-overridden.yaml deleted file mode 100644 index e9c1eef9dc3..00000000000 --- a/.chloggen/jpkroehling_allow-compression-list-to-be-overridden.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: 'enhancement' - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Allow the compression list to be overridden - -# One or more tracking issues or pull requests related to the change -issues: [10295] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: Allows Collector administrators to control which compression algorithms to enable for HTTP-based receivers. \ No newline at end of file diff --git a/.chloggen/jpkroehling_revert-zstd.yaml b/.chloggen/jpkroehling_revert-zstd.yaml deleted file mode 100644 index 768888bf1a8..00000000000 --- a/.chloggen/jpkroehling_revert-zstd.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: configgrpc - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Revert the zstd compression for gRPC to the third-party library we were using previously. - -# One or more tracking issues or pull requests related to the change -issues: [10394] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: We switched back to our compression logic for zstd when a CVE was found on the third-party library we were using. Now that the third-party library has been fixed, we can revert to that one. For end-users, this has no practical effect. The reproducers for the CVE were tested against this patch, confirming we are not reintroducing the bugs. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [user] diff --git a/.chloggen/mx-psi_asstring.yaml b/.chloggen/mx-psi_asstring.yaml deleted file mode 100644 index 51f2aed1f7a..00000000000 --- a/.chloggen/mx-psi_asstring.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confmap - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Adds `confmap.Retrieved.AsString` method that returns the configuration value as a string" - -# One or more tracking issues or pull requests related to the change -issues: [9532] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/mx-psi_newretrievedfromyaml.yaml b/.chloggen/mx-psi_newretrievedfromyaml.yaml deleted file mode 100644 index 770fdc36439..00000000000 --- a/.chloggen/mx-psi_newretrievedfromyaml.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confmap - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Adds `confmap.NewRetrievedFromYAML` helper to create `confmap.Retrieved` values from YAML bytes" - -# One or more tracking issues or pull requests related to the change -issues: [9532] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/mx-psi_weaklytypedinput.yaml b/.chloggen/mx-psi_weaklytypedinput.yaml deleted file mode 100644 index 68700dd43d6..00000000000 --- a/.chloggen/mx-psi_weaklytypedinput.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confmap - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Adds alpha `confmap.strictlyTypedInput` feature gate that enables strict type checks during configuration resolution" - -# One or more tracking issues or pull requests related to the change -issues: [9532] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - When enabled, the configuration resolution system will: - - Stop doing most kinds of implicit type casting when resolving configuration values - - Use the original string representation of configuration values if the ${} syntax is used in inline position - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/otelcol-default-providers-featuregate-2.yaml b/.chloggen/otelcol-default-providers-featuregate-2.yaml deleted file mode 100644 index f6025aac200..00000000000 --- a/.chloggen/otelcol-default-providers-featuregate-2.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcol - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate `otelcol.NewCommand`. Use `otelcol.NewCommandMustProviderSettings` instead. - -# One or more tracking issues or pull requests related to the change -issues: [10359] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/otelcol-default-providers-featuregate.yaml b/.chloggen/otelcol-default-providers-featuregate.yaml deleted file mode 100644 index d7c16250475..00000000000 --- a/.chloggen/otelcol-default-providers-featuregate.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcoltest - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate `LoadConfig` and `LoadConfigAndValidate`. Use `LoadConfigWithSettings` and `LoadConfigAndValidateWithSettings` instead - -# One or more tracking issues or pull requests related to the change -issues: [10359] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/remove_unmarshalconfig.yaml b/.chloggen/remove_unmarshalconfig.yaml deleted file mode 100644 index b8a0ec5bec5..00000000000 --- a/.chloggen/remove_unmarshalconfig.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated `component.UnmarshalConfig` - -# One or more tracking issues or pull requests related to the change -issues: [7102] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/yaml-hook.yaml b/.chloggen/yaml-hook.yaml deleted file mode 100644 index 8d59edb27ad..00000000000 --- a/.chloggen/yaml-hook.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confmap - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix issue where structs with only yaml tags were not marshaled correctly. - -# One or more tracking issues or pull requests related to the change -issues: [10282] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/zpagesextension_confighttp-user.yaml b/.chloggen/zpagesextension_confighttp-user.yaml deleted file mode 100644 index 3c5efdfaa94..00000000000 --- a/.chloggen/zpagesextension_confighttp-user.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Use `confighttp.ServerConfig` as part of zpagesextension. See [https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/confighttp/README.md#server-configuration](server configuration) options. - -# One or more tracking issues or pull requests related to the change -issues: [9368] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [user] diff --git a/.chloggen/zpagesextension_confighttp.yaml b/.chloggen/zpagesextension_confighttp.yaml deleted file mode 100644 index c8664877eb6..00000000000 --- a/.chloggen/zpagesextension_confighttp.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Use `confighttp.ServerConfig` as part of zpagesextension.Config. Previously the extension used `confignet.TCPAddrConfig` - -# One or more tracking issues or pull requests related to the change -issues: [9368] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/CHANGELOG-API.md b/CHANGELOG-API.md index 5a2464dda0c..2d5ddd588c6 100644 --- a/CHANGELOG-API.md +++ b/CHANGELOG-API.md @@ -7,6 +7,52 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG +## v1.10.0/v0.103.0 + +### 🛑 Breaking changes 🛑 + +- `component`: Remove deprecated `component.UnmarshalConfig` (#7102) +- `confighttp`: Use `confighttp.ServerConfig` as part of zpagesextension.Config. Previously the extension used `confignet.TCPAddrConfig` (#9368) + +### 🚩 Deprecations 🚩 + +- `connector`: Deprecate CreateSettings and NewNopCreateSettings (#9428) + The following methods are being renamed: + - connector.CreateSettings -> connector.Settings + - connector.NewNopCreateSettings -> connector.NewNopSettings + +- `exporter`: Deprecate CreateSettings and NewNopCreateSettings (#9428) + The following methods are being renamed: + - exporter.CreateSettings -> exporter.Settings + - exporter.NewNopCreateSettings -> exporter.NewNopSettings + +- `extension`: Deprecate CreateSettings and NewNopCreateSettings (#9428) + The following methods are being renamed: + - extension.CreateSettings -> extension.Settings + - extension.NewNopCreateSettings -> extension.NewNopSettings + +- `processor`: Deprecate CreateSettings and NewNopCreateSettings (#9428) + The following methods are being renamed: + - processor.CreateSettings -> processor.Settings + - processor.NewNopCreateSettings -> processor.NewNopSettings + +- `receiver`: Deprecate CreateSettings and NewNopCreateSettings (#9428) + The following methods are being renamed: + - receiver.CreateSettings -> receiver.Settings + - receiver.NewNopCreateSettings -> receiver.NewNopSettings + +- `configauth`: Deprecate `GetClientAuthenticator` and `GetServerAuthenticator`, use `GetClientAuthenticatorContext` and `GetServerAuthenticatorContext` instead. (#9808) +- `confighttp`: Deprecate `ClientConfig.CustomRoundTripper` (#8627) + Set the `Transport` field on the `*http.Client` object returned from `(ClientConfig).ToClient` instead. +- `filter`: Deprecate the `filter.CombinedFilter` struct (#10348) +- `otelcol`: Deprecate `otelcol.NewCommand`. Use `otelcol.NewCommandMustProviderSettings` instead. (#10359) +- `otelcoltest`: Deprecate `LoadConfig` and `LoadConfigAndValidate`. Use `LoadConfigWithSettings` and `LoadConfigAndValidateWithSettings` instead (#10359) + +### 💡 Enhancements 💡 + +- `confmap`: Adds `confmap.Retrieved.AsString` method that returns the configuration value as a string (#9532) +- `confmap`: Adds `confmap.NewRetrievedFromYAML` helper to create `confmap.Retrieved` values from YAML bytes (#9532) + ## v0.102.1 No API-only changes on this release. **This release addresses [GHSA-c74f-6mfw-mm4v](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `configgrpc`.** diff --git a/CHANGELOG.md b/CHANGELOG.md index 57c96822e00..2779ed45a48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,49 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./ +## v1.10.0/v0.103.0 + +### 🛑 Breaking changes 🛑 + +- `exporter/debug`: Disable sampling by default (#9921) + To restore the behavior that was previously the default, set `sampling_thereafter` to `500`. + +### 💡 Enhancements 💡 + +- `cmd/builder`: Allow setting `otelcol.CollectorSettings.ResolverSettings.DefaultScheme` via the builder's `conf_resolver.default_uri_scheme` configuration option (#10296) +- `mdatagen`: add support for optional internal metrics (#10316) +- `otelcol/expandconverter`: Add `confmap.unifyEnvVarExpansion` feature gate to allow enabling Collector/Configuration SIG environment variable expansion rules. (#10391) + When enabled, this feature gate will: + - Disable expansion of BASH-style env vars (`$FOO`) + - `${FOO}` will be expanded as if it was `${env:FOO} + See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. + +- `confmap`: Add `confmap.unifyEnvVarExpansion` feature gate to allow enabling Collector/Configuration SIG environment variable expansion rules. (#10259) + When enabled, this feature gate will: + - Disable expansion of BASH-style env vars (`$FOO`) + - `${FOO}` will be expanded as if it was `${env:FOO} + See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. + +- `confighttp`: Allow the compression list to be overridden (#10295) + Allows Collector administrators to control which compression algorithms to enable for HTTP-based receivers. +- `configgrpc`: Revert the zstd compression for gRPC to the third-party library we were using previously. (#10394) + We switched back to our compression logic for zstd when a CVE was found on the third-party library we were using. Now that the third-party library has been fixed, we can revert to that one. For end-users, this has no practical effect. The reproducers for the CVE were tested against this patch, confirming we are not reintroducing the bugs. +- `confmap`: Adds alpha `confmap.strictlyTypedInput` feature gate that enables strict type checks during configuration resolution (#9532) + When enabled, the configuration resolution system will: + - Stop doing most kinds of implicit type casting when resolving configuration values + - Use the original string representation of configuration values if the ${} syntax is used in inline position + +- `confighttp`: Use `confighttp.ServerConfig` as part of zpagesextension. See [https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/confighttp/README.md#server-configuration](server configuration) options. (#9368) + +### 🧰 Bug fixes 🧰 + +- `exporterhelper`: Fix potential deadlock in the batch sender (#10315) +- `expandconverter`: Fix bug where an warning was logged incorrectly. (#10392) +- `exporterhelper`: Fix a bug when the retry and timeout logic was not applied with enabled batching. (#10166) +- `exporterhelper`: Fix a bug where an unstarted batch_sender exporter hangs on shutdown (#10306) +- `exporterhelper`: Fix small batch due to unfavorable goroutine scheduling in batch sender (#9952) +- `confmap`: Fix issue where structs with only yaml tags were not marshaled correctly. (#10282) + ## v0.102.1 **This release addresses [GHSA-c74f-6mfw-mm4v](https://github.com/open-telemetry/opentelemetry-collector/security/advisories/GHSA-c74f-6mfw-mm4v) for `configgrpc`.** diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 3d2d96f9b65..33cb0ab008a 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -17,7 +17,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.102.1" +const defaultOtelColVersion = "0.103.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 064502bf4ee..6e9f8257205 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -1,36 +1,41 @@ +# NOTE: +# This builder configuration is NOT used to build any official binary. +# To see the builder manifests used for official binaries, +# check https://github.com/open-telemetry/opentelemetry-collector-releases +# +# For the OpenTelemetry Collector Core official distribution sources, check +# https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol + dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.102.1-dev - otelcol_version: 0.102.1 - -conf_resolver: - default_uri_scheme: "env" + version: 0.103.0-dev + otelcol_version: 0.103.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.1 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.103.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.1 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.102.1 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.1 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.1 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.103.0 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.103.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.103.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.1 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.1 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.103.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.1 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.103.0 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index e4abafd2800..4b39421df81 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.102.1 + otelcol_version: 0.103.0 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.102.1 + gomod: go.opentelemetry.io/collector v0.103.0 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.102.1 + gomod: go.opentelemetry.io/collector v0.103.0 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/debugexporter - gomod: go.opentelemetry.io/collector v0.102.1 + gomod: go.opentelemetry.io/collector v0.103.0 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 45876397fa2..45649111b17 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -5,15 +5,15 @@ go 1.21.0 require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/filter v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/receiver v0.102.1 - go.opentelemetry.io/collector/semconv v0.102.1 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/filter v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/receiver v0.103.0 + go.opentelemetry.io/collector/semconv v0.103.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 @@ -46,7 +46,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index a5fd63d4597..6197cd1c540 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -10,34 +10,34 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.102.1-dev - otelcol_version: 0.102.1 + version: 0.103.0-dev + otelcol_version: 0.103.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.1 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.103.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.1 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.102.1 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.1 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.1 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.103.0 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.103.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.103.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.1 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.1 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.103.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.1 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.103.0 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 8258cef0bf2..45a3afe8a8a 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -7,33 +7,33 @@ go 1.21.0 toolchain go1.21.11 require ( - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 - go.opentelemetry.io/collector/connector v0.102.1 - go.opentelemetry.io/collector/connector/forwardconnector v0.102.1 - go.opentelemetry.io/collector/exporter v0.102.1 - go.opentelemetry.io/collector/exporter/debugexporter v0.102.1 - go.opentelemetry.io/collector/exporter/loggingexporter v0.102.1 - go.opentelemetry.io/collector/exporter/nopexporter v0.102.1 - go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1 - go.opentelemetry.io/collector/extension v0.102.1 - go.opentelemetry.io/collector/extension/ballastextension v0.102.1 - go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1 - go.opentelemetry.io/collector/extension/zpagesextension v0.102.1 - go.opentelemetry.io/collector/otelcol v0.102.1 - go.opentelemetry.io/collector/processor v0.102.1 - go.opentelemetry.io/collector/processor/batchprocessor v0.102.1 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.1 - go.opentelemetry.io/collector/receiver v0.102.1 - go.opentelemetry.io/collector/receiver/nopreceiver v0.102.1 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.103.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 + go.opentelemetry.io/collector/connector v0.103.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.103.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.103.0 + go.opentelemetry.io/collector/exporter/nopexporter v0.103.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector/extension/ballastextension v0.103.0 + go.opentelemetry.io/collector/extension/memorylimiterextension v0.103.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.103.0 + go.opentelemetry.io/collector/otelcol v0.103.0 + go.opentelemetry.io/collector/processor v0.103.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.103.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.0 + go.opentelemetry.io/collector/receiver v0.103.0 + go.opentelemetry.io/collector/receiver/nopreceiver v0.103.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0 golang.org/x/sys v0.21.0 ) @@ -79,23 +79,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.102.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect - go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.102.1 // indirect - go.opentelemetry.io/collector/config/confighttp v0.102.1 // indirect - go.opentelemetry.io/collector/config/confignet v0.102.1 // indirect - go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.102.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/config/configtls v0.102.1 // indirect - go.opentelemetry.io/collector/config/internal v0.102.1 // indirect - go.opentelemetry.io/collector/consumer v0.102.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect - go.opentelemetry.io/collector/semconv v0.102.1 // indirect - go.opentelemetry.io/collector/service v0.102.1 // indirect + go.opentelemetry.io/collector v0.103.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.103.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.103.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.103.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.103.0 // indirect + go.opentelemetry.io/collector/config/internal v0.103.0 // indirect + go.opentelemetry.io/collector/consumer v0.103.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/semconv v0.103.0 // indirect + go.opentelemetry.io/collector/service v0.103.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 8d43a502790..358cb8644cd 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -21,7 +21,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.102.1-dev", + Version: "0.103.0-dev", } set := otelcol.CollectorSettings{ diff --git a/component/go.mod b/component/go.mod index b8ed8845c48..d5610bae4d8 100644 --- a/component/go.mod +++ b/component/go.mod @@ -7,8 +7,8 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.54.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/exporters/prometheus v0.49.0 go.opentelemetry.io/otel/metric v1.27.0 diff --git a/config/configauth/go.mod b/config/configauth/go.mod index fbdcfe8ff16..19a6793fc08 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -4,9 +4,9 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/extension v0.102.1 - go.opentelemetry.io/collector/extension/auth v0.102.1 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector/extension/auth v0.103.0 go.uber.org/goleak v1.3.0 ) @@ -21,10 +21,10 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/confmap v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/confmap v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 8c81e8cdb58..7d3954590d3 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -5,18 +5,18 @@ go 1.21.0 require ( github.com/mostynb/go-grpc-compression v1.2.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configauth v0.102.1 - go.opentelemetry.io/collector/config/configcompression v1.9.0 - go.opentelemetry.io/collector/config/confignet v0.102.1 - go.opentelemetry.io/collector/config/configopaque v1.9.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/config/configtls v0.102.1 - go.opentelemetry.io/collector/config/internal v0.102.1 - go.opentelemetry.io/collector/extension/auth v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configauth v0.103.0 + go.opentelemetry.io/collector/config/configcompression v1.10.0 + go.opentelemetry.io/collector/config/confignet v0.103.0 + go.opentelemetry.io/collector/config/configopaque v1.10.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/config/configtls v0.103.0 + go.opentelemetry.io/collector/config/internal v0.103.0 + go.opentelemetry.io/collector/extension/auth v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 @@ -49,9 +49,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.1 // indirect - go.opentelemetry.io/collector/extension v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/confmap v0.103.0 // indirect + go.opentelemetry.io/collector/extension v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 75116b65f8b..4956ad116a7 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -7,15 +7,15 @@ require ( github.com/klauspost/compress v1.17.8 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configauth v0.102.1 - go.opentelemetry.io/collector/config/configcompression v1.9.0 - go.opentelemetry.io/collector/config/configopaque v1.9.0 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/config/configtls v0.102.1 - go.opentelemetry.io/collector/config/internal v0.102.1 - go.opentelemetry.io/collector/extension/auth v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configauth v0.103.0 + go.opentelemetry.io/collector/config/configcompression v1.10.0 + go.opentelemetry.io/collector/config/configopaque v1.10.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/config/configtls v0.103.0 + go.opentelemetry.io/collector/config/internal v0.103.0 + go.opentelemetry.io/collector/extension/auth v0.103.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 @@ -44,10 +44,10 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.1 // indirect - go.opentelemetry.io/collector/extension v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/confmap v0.103.0 // indirect + go.opentelemetry.io/collector/extension v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect diff --git a/config/configtls/go.mod b/config/configtls/go.mod index b11afa8550a..e2bb8dd3e1c 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -5,7 +5,7 @@ go 1.21.0 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configopaque v1.9.0 + go.opentelemetry.io/collector/config/configopaque v1.10.0 ) require ( diff --git a/config/internal/go.mod b/config/internal/go.mod index bc1c7f91db0..302136bd7f5 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 + go.opentelemetry.io/collector v0.103.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -13,7 +13,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index 753fc21a231..f622a5442d2 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -4,9 +4,9 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/featuregate v1.9.0 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/featuregate v1.10.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/go.mod b/confmap/go.mod index cbe325bbac2..2a0d358c298 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -8,7 +8,7 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 github.com/knadh/koanf/v2 v2.1.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/featuregate v1.9.0 + go.opentelemetry.io/collector/featuregate v1.10.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/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod index d6d699d3e33..d1649893ed7 100644 --- a/confmap/internal/e2e/go.mod +++ b/confmap/internal/e2e/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap v0.103.0 go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 - go.opentelemetry.io/collector/featuregate v1.9.0 + go.opentelemetry.io/collector/featuregate v1.10.0 ) require ( diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index 00fb83feb8e..d4d9b067f60 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap v0.103.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -19,7 +19,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index 55878a0b4bd..c51548f04dc 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap v0.103.0 go.uber.org/goleak v1.3.0 ) @@ -18,7 +18,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index 207a3db8ded..6491d8affac 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap v0.103.0 go.uber.org/goleak v1.3.0 ) @@ -18,7 +18,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index d4e06e15241..7264cbe3b02 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap v0.103.0 go.uber.org/goleak v1.3.0 ) @@ -18,7 +18,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index c16458191d6..eb31c60e56e 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap v0.103.0 go.uber.org/goleak v1.3.0 ) @@ -18,7 +18,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index d634948cd5e..d24d5022777 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,11 +4,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/connector v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/connector v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 go.uber.org/goleak v1.3.0 ) @@ -35,9 +35,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.102.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/connector/go.mod b/connector/go.mod index 147011cb3d4..ec511264df7 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -30,7 +30,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index a70aae0d153..121a85a3ca1 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -4,8 +4,8 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 go.uber.org/goleak v1.3.0 ) diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 6d83ea5eb5b..d7b06607b5d 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -4,13 +4,13 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/exporter v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -39,11 +39,11 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.102.1 // indirect - go.opentelemetry.io/collector/config/configretry v0.102.1 // indirect - go.opentelemetry.io/collector/extension v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.1 // indirect + go.opentelemetry.io/collector v0.103.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.103.0 // indirect + go.opentelemetry.io/collector/extension v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/receiver v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/go.mod b/exporter/go.mod index 16060bb22e3..6b36eb211cf 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,15 +6,15 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configretry v0.102.1 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/extension v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 - go.opentelemetry.io/collector/receiver v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configretry v0.103.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector/receiver v0.103.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 @@ -49,8 +49,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/confmap v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/text v0.15.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 9e32d8fd62d..70b16b95bc1 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/exporter v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -38,12 +38,12 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.102.1 // indirect - go.opentelemetry.io/collector/config/configretry v0.102.1 // indirect - go.opentelemetry.io/collector/consumer v0.102.1 // indirect - go.opentelemetry.io/collector/extension v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.1 // indirect + go.opentelemetry.io/collector v0.103.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.103.0 // indirect + go.opentelemetry.io/collector/consumer v0.103.0 // indirect + go.opentelemetry.io/collector/extension v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/receiver v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index 332b0e0a3a8..11b194e85b7 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -4,11 +4,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/exporter v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 go.uber.org/goleak v1.3.0 ) @@ -35,9 +35,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/receiver v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 0626208742e..171134158ab 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,19 +4,19 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configauth v0.102.1 - go.opentelemetry.io/collector/config/configcompression v1.9.0 - go.opentelemetry.io/collector/config/configgrpc v0.102.1 - go.opentelemetry.io/collector/config/configopaque v1.9.0 - go.opentelemetry.io/collector/config/configretry v0.102.1 - go.opentelemetry.io/collector/config/configtls v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/exporter v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configauth v0.103.0 + go.opentelemetry.io/collector/config/configcompression v1.10.0 + go.opentelemetry.io/collector/config/configgrpc v0.103.0 + go.opentelemetry.io/collector/config/configopaque v1.10.0 + go.opentelemetry.io/collector/config/configretry v0.103.0 + go.opentelemetry.io/collector/config/configtls v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -53,13 +53,13 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.102.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/config/internal v0.102.1 // indirect - go.opentelemetry.io/collector/extension v0.102.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.1 // indirect + go.opentelemetry.io/collector/config/confignet v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/config/internal v0.103.0 // indirect + go.opentelemetry.io/collector/extension v0.103.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/receiver v0.103.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 2f8de3691bc..e553ac23beb 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,17 +4,17 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configcompression v1.9.0 - go.opentelemetry.io/collector/config/confighttp v0.102.1 - go.opentelemetry.io/collector/config/configopaque v1.9.0 - go.opentelemetry.io/collector/config/configretry v0.102.1 - go.opentelemetry.io/collector/config/configtls v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/exporter v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configcompression v1.10.0 + go.opentelemetry.io/collector/config/confighttp v0.103.0 + go.opentelemetry.io/collector/config/configopaque v1.10.0 + go.opentelemetry.io/collector/config/configretry v0.103.0 + go.opentelemetry.io/collector/config/configtls v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -52,13 +52,13 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/config/internal v0.102.1 // indirect - go.opentelemetry.io/collector/extension v0.102.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/receiver v0.102.1 // indirect + go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/config/internal v0.103.0 // indirect + go.opentelemetry.io/collector/extension v0.103.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/receiver v0.103.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/extension/auth/go.mod b/extension/auth/go.mod index b3fc8893e9c..fd224c13122 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -4,8 +4,8 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/extension v0.102.1 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 go.uber.org/goleak v1.3.0 google.golang.org/grpc v1.64.0 ) @@ -29,10 +29,10 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/confmap v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/confmap v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index f5bc31e0b6c..c174281d886 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -5,10 +5,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/extension v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -40,9 +40,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/go.mod b/extension/go.mod index 311d2ffa1e7..06311507ab3 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -5,8 +5,8 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 go.uber.org/goleak v1.3.0 ) @@ -29,9 +29,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 4d0066d0d9b..892db56f289 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/extension v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -39,9 +39,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index c134280c0aa..7e965557c4d 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,12 +4,12 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configauth v0.102.1 - go.opentelemetry.io/collector/config/confighttp v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/extension v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configauth v0.103.0 + go.opentelemetry.io/collector/config/confighttp v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 go.opentelemetry.io/contrib/zpages v0.52.0 go.opentelemetry.io/otel/sdk v1.27.0 go.opentelemetry.io/otel/trace v1.27.0 @@ -44,14 +44,14 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/config/configtls v0.102.1 // indirect - go.opentelemetry.io/collector/config/internal v0.102.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.103.0 // indirect + go.opentelemetry.io/collector/config/internal v0.103.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/filter/go.mod b/filter/go.mod index 8f6a832124b..f69262e2587 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap v0.103.0 ) require ( @@ -17,7 +17,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.mod b/go.mod index 6450a51aca6..06653587634 100644 --- a/go.mod +++ b/go.mod @@ -13,12 +13,12 @@ go 1.21.0 require ( github.com/shirou/gopsutil/v4 v4.24.5 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/featuregate v1.9.0 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/featuregate v1.10.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 go.opentelemetry.io/contrib/config v0.7.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 @@ -56,7 +56,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index cc0433ea953..46f7a87b83f 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -4,21 +4,21 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configgrpc v0.102.1 - go.opentelemetry.io/collector/config/confighttp v0.102.1 - go.opentelemetry.io/collector/config/configopaque v1.9.0 - go.opentelemetry.io/collector/config/configretry v0.102.1 - go.opentelemetry.io/collector/config/configtls v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/exporter v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configgrpc v0.103.0 + go.opentelemetry.io/collector/config/confighttp v0.103.0 + go.opentelemetry.io/collector/config/configopaque v1.10.0 + go.opentelemetry.io/collector/config/configretry v0.103.0 + go.opentelemetry.io/collector/config/configtls v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 - go.opentelemetry.io/collector/receiver v0.102.1 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector/receiver v0.103.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1 go.uber.org/goleak v1.3.0 ) @@ -54,14 +54,14 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect - go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.102.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/config/internal v0.102.1 // indirect - go.opentelemetry.io/collector/extension v0.102.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/config/internal v0.103.0 // indirect + go.opentelemetry.io/collector/extension v0.103.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index bf09630c14c..39c77603dea 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,23 +5,23 @@ go 1.21.0 require ( github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 - go.opentelemetry.io/collector/connector v0.102.1 - go.opentelemetry.io/collector/exporter v0.102.1 - go.opentelemetry.io/collector/extension v0.102.1 - go.opentelemetry.io/collector/featuregate v1.9.0 - go.opentelemetry.io/collector/processor v0.102.1 - go.opentelemetry.io/collector/receiver v0.102.1 - go.opentelemetry.io/collector/service v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.103.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 + go.opentelemetry.io/collector/connector v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector/featuregate v1.10.0 + go.opentelemetry.io/collector/processor v0.103.0 + go.opentelemetry.io/collector/receiver v0.103.0 + go.opentelemetry.io/collector/service v0.103.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -68,10 +68,10 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.102.1 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.102.1 // indirect - go.opentelemetry.io/collector/semconv v0.102.1 // indirect + go.opentelemetry.io/collector/consumer v0.103.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.103.0 // indirect + go.opentelemetry.io/collector/semconv v0.103.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod index 223daa72e20..fe049a6daff 100644 --- a/pdata/pprofile/go.mod +++ b/pdata/pprofile/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.11 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector/pdata v1.10.0 ) require ( diff --git a/pdata/testdata/go.mod b/pdata/testdata/go.mod index 7e710eea35b..b310727a48f 100644 --- a/pdata/testdata/go.mod +++ b/pdata/testdata/go.mod @@ -2,7 +2,7 @@ module go.opentelemetry.io/collector/pdata/testdata go 1.21.0 -require go.opentelemetry.io/collector/pdata v1.9.0 +require go.opentelemetry.io/collector/pdata v1.10.0 require ( github.com/gogo/protobuf v1.3.2 // indirect diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 3704115adb8..5b9cdc0af1d 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -4,14 +4,14 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 - go.opentelemetry.io/collector/processor v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector/processor v0.103.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 @@ -43,7 +43,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/go.mod b/processor/go.mod index 69688a9a3ef..97acff2356d 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -5,12 +5,12 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index ac8be13d419..69b5c61fa77 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,12 +4,12 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/processor v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/processor v0.103.0 go.uber.org/goleak v1.3.0 ) @@ -43,9 +43,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.102.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/receiver/go.mod b/receiver/go.mod index dcc78322179..c1a73d56abb 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index f41e8a00402..c034cd2f02c 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/receiver v0.102.1 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/receiver v0.103.0 go.uber.org/goleak v1.3.0 ) @@ -34,9 +34,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect - go.opentelemetry.io/collector/pdata v1.9.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index e84348cac8b..9c53fdafec5 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -6,17 +6,17 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/klauspost/compress v1.17.8 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/configgrpc v0.102.1 - go.opentelemetry.io/collector/config/confighttp v0.102.1 - go.opentelemetry.io/collector/config/confignet v0.102.1 - go.opentelemetry.io/collector/config/configtls v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 - go.opentelemetry.io/collector/receiver v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/configgrpc v0.103.0 + go.opentelemetry.io/collector/config/confighttp v0.103.0 + go.opentelemetry.io/collector/config/confignet v0.103.0 + go.opentelemetry.io/collector/config/configtls v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector/receiver v0.103.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -53,14 +53,14 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect - go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect - go.opentelemetry.io/collector/config/internal v0.102.1 // indirect - go.opentelemetry.io/collector/extension v0.102.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect - go.opentelemetry.io/collector/featuregate v1.9.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/config/internal v0.103.0 // indirect + go.opentelemetry.io/collector/extension v0.103.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/service/go.mod b/service/go.mod index 2499e36c0a5..f5d30402540 100644 --- a/service/go.mod +++ b/service/go.mod @@ -10,22 +10,22 @@ require ( github.com/shirou/gopsutil/v4 v4.24.5 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.102.1 - go.opentelemetry.io/collector/component v0.102.1 - go.opentelemetry.io/collector/config/confighttp v0.102.1 - go.opentelemetry.io/collector/config/configtelemetry v0.102.1 - go.opentelemetry.io/collector/confmap v0.102.1 - go.opentelemetry.io/collector/connector v0.102.1 - go.opentelemetry.io/collector/consumer v0.102.1 - go.opentelemetry.io/collector/exporter v0.102.1 - go.opentelemetry.io/collector/extension v0.102.1 - go.opentelemetry.io/collector/extension/zpagesextension v0.102.1 - go.opentelemetry.io/collector/featuregate v1.9.0 - go.opentelemetry.io/collector/pdata v1.9.0 - go.opentelemetry.io/collector/pdata/testdata v0.102.1 - go.opentelemetry.io/collector/processor v0.102.1 - go.opentelemetry.io/collector/receiver v0.102.1 - go.opentelemetry.io/collector/semconv v0.102.1 + go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/config/confighttp v0.103.0 + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/connector v0.103.0 + go.opentelemetry.io/collector/consumer v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.103.0 + go.opentelemetry.io/collector/featuregate v1.10.0 + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector/processor v0.103.0 + go.opentelemetry.io/collector/receiver v0.103.0 + go.opentelemetry.io/collector/semconv v0.103.0 go.opentelemetry.io/contrib/config v0.7.0 go.opentelemetry.io/contrib/propagators/b3 v1.27.0 go.opentelemetry.io/otel v1.27.0 @@ -78,12 +78,12 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect - go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.102.1 // indirect - go.opentelemetry.io/collector/config/internal v0.102.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect + go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.103.0 // indirect + go.opentelemetry.io/collector/config/internal v0.103.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect diff --git a/versions.yaml b/versions.yaml index 71140f2d0a9..363f831f43c 100644 --- a/versions.yaml +++ b/versions.yaml @@ -3,14 +3,14 @@ module-sets: stable: - version: v1.9.0 + version: v1.10.0 modules: - go.opentelemetry.io/collector/featuregate - go.opentelemetry.io/collector/pdata - go.opentelemetry.io/collector/config/configopaque - go.opentelemetry.io/collector/config/configcompression beta: - version: v0.102.1 + version: v0.103.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder From 9bd581be6eba098c9c1bc6ac91bcb924dba2bc6a Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Tue, 18 Jun 2024 10:14:29 -0500 Subject: [PATCH 084/168] Add goreleaser check and attempt update (#10428) https://github.com/open-telemetry/opentelemetry-collector/pull/10384 updated `goreleaser` to a new major version and this appears to have [broken the config](https://github.com/open-telemetry/opentelemetry-collector/actions/runs/9565775767/job/26369463094). This problem only became apparent during the release process since the config is not used otherwise. This PR adds a github action to run `goreleaser check` on all PRs, since changes to the config may not be caught until release is attempted. I've also included what may be the only necessary change to the config, by [renaming `changelog.skip` to `changelog.disable`](https://github.com/goreleaser/goreleaser/commit/29f30b623ef8f0a19607afab22b3f3a2f9f68172). This passes `goreleaser check` when run locally. The `monorepo` section of the config fails locally, but the feature appears to require the Pro version so I'm unclear if it will pass with the OSS version. --- .github/workflows/check-goreleaser.yaml | 29 +++++++++++++++++++++++++ cmd/builder/.goreleaser.yml | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/check-goreleaser.yaml diff --git a/.github/workflows/check-goreleaser.yaml b/.github/workflows/check-goreleaser.yaml new file mode 100644 index 00000000000..6f25384f229 --- /dev/null +++ b/.github/workflows/check-goreleaser.yaml @@ -0,0 +1,29 @@ +name: Check GoReleaser Config +on: + push: + branches: [main] + tags: + - "v[0-9]+.[0-9]+.[0-9]+*" + pull_request: + +jobs: + check: + runs-on: ubuntu-latest + steps: + - name: Checkout Repo + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + with: + fetch-depth: 0 + - name: Setup Go + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + with: + go-version: ~1.21.5 + - name: Check GoReleaser + uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 + with: + distribution: goreleaser-pro + version: latest + args: check --verbose cmd/builder/.goreleaser.yml + env: + GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml index 7cb52fa0ffa..a964ac6c6ee 100644 --- a/cmd/builder/.goreleaser.yml +++ b/cmd/builder/.goreleaser.yml @@ -36,4 +36,4 @@ checksum: snapshot: name_template: "{{ .Tag }}-next" changelog: - skip: true + disable: true From ae2ed9db4febcf48198faf9511db5afe2551ef12 Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Tue, 18 Jun 2024 10:21:34 -0500 Subject: [PATCH 085/168] Change builder release trigger to module tag (#10429) This PR changes the trigger for releasing the builder to match the builder module tag. This allows us to release the builder separately by pushing a dedicated tag. --- .github/workflows/builder-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 38a9f67fbfa..ef54c8e4b6f 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -3,7 +3,7 @@ name: Builder - Release on: push: tags: - - 'v*' + - 'cmd/builder/v*' jobs: goreleaser: From 0ca892ae068855b1a32c168685f80de878e63f5e Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Tue, 18 Jun 2024 12:28:32 -0500 Subject: [PATCH 086/168] Update release instructions (#10431) Step 8 in the core release process references a draft PR opened in Step 1. However, Step 1 was changed somewhat recently to state that this PR should be merged before proceeding. Therefore, a new PR should be opened. Since this new PR is for contrib and no longer directly associated with a step in the core process, it makes sense to move it to Step 1 of contrib section. --- docs/release.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/release.md b/docs/release.md index fd637732ec3..e14058ed733 100644 --- a/docs/release.md +++ b/docs/release.md @@ -50,7 +50,9 @@ It is possible that a core approver isn't a contrib approver. In that case, the 7. A new `v0.85.0` release should be automatically created on Github by now. Edit it and use the contents from the CHANGELOG.md and CHANGELOG-API.md as the release's description. -8. Update the draft PR to Contrib created in step 1 to use the newly released Core version and set it to Ready for Review. +## Releasing opentelemetry-collector-contrib + +1. Open a PR to Contrib to use the newly released Core version and set it to Ready for Review. - Run `make update-otel OTEL_VERSION=v0.85.0 OTEL_STABLE_VERSION=v1.1.0` - Manually update `cmd/otelcontribcol/builder-config.yaml` - Manually update `cmd/oteltestbedcol/builder-config.yaml` @@ -58,17 +60,15 @@ It is possible that a core approver isn't a contrib approver. In that case, the - Push updates to the PR - 🛑 **Do not move forward until this PR is merged.** 🛑 -## Releasing opentelemetry-collector-contrib - -1. Manually run the action [Automation - Prepare Release](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/workflows/prepare-release.yml). When prompted, enter the version numbers determined in Step 1, but do not include a leading `v`. This action will create a pull request to update the changelog and version numbers in the repo. **While this PR is open all merging in Contrib should be halted**. +2. Manually run the action [Automation - Prepare Release](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/workflows/prepare-release.yml). When prompted, enter the version numbers determined in Step 1, but do not include a leading `v`. This action will create a pull request to update the changelog and version numbers in the repo. **While this PR is open all merging in Contrib should be halted**. - If the PR needs updated in any way you can make the changes in a fork and PR those changes into the `prepare-release-prs/x` branch. You do not need to wait for the CI to pass in this prep-to-prep PR. - 🛑 **Do not move forward until this PR is merged.** 🛑 -2. Check out the commit created by merging the PR created by `Automation - Prepare Release` (e.g. `prepare-release-prs/0.85.0`) and create a branch named `release/` (e.g. `release/v0.85.x`). Push the new branch to `open-telemetry/opentelemetry-collector-contrib`. +3. Check out the commit created by merging the PR created by `Automation - Prepare Release` (e.g. `prepare-release-prs/0.85.0`) and create a branch named `release/` (e.g. `release/v0.85.x`). Push the new branch to `open-telemetry/opentelemetry-collector-contrib`. -3. Make sure you are on `release/`. Tag all the module groups (`contrib-base`) with the new release version by running the `make push-tags MODSET=contrib-base` command. If you set your remote using `https` you need to include `REMOTE=https://github.com/open-telemetry/opentelemetry-collector-contrib.git` in each command. Wait for the new tag build to pass successfully. +4. Make sure you are on `release/`. Tag all the module groups (`contrib-base`) with the new release version by running the `make push-tags MODSET=contrib-base` command. If you set your remote using `https` you need to include `REMOTE=https://github.com/open-telemetry/opentelemetry-collector-contrib.git` in each command. Wait for the new tag build to pass successfully. -4. A new `v0.85.0` release should be automatically created on Github by now. Edit it and use the contents from the CHANGELOG.md as the release's description. +5. A new `v0.85.0` release should be automatically created on Github by now. Edit it and use the contents from the CHANGELOG.md as the release's description. ## Producing the artifacts From 33140c770762f39b2de274feeff78a87d67efcf0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 10:29:45 -0700 Subject: [PATCH 087/168] Update All go.opentelemetry.io/collector packages to v0.103.0 (#10430) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [go.opentelemetry.io/collector/confmap/provider/envprovider](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.102.1` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/confmap/provider/fileprovider](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.102.1` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/exporter/otlpexporter](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.102.1` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/exporter/otlphttpexporter](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.102.1` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/receiver/otlpreceiver](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.102.1` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.102.1/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
open-telemetry/opentelemetry-collector (go.opentelemetry.io/collector/confmap/provider/envprovider) ### [`v0.103.0`](https://togithub.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v1100v01030) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector/compare/v0.102.1...v0.103.0) ##### 🛑 Breaking changes 🛑 - `exporter/debug`: Disable sampling by default ([#​9921](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9921)) To restore the behavior that was previously the default, set `sampling_thereafter` to `500`. ##### 💡 Enhancements 💡 - `cmd/builder`: Allow setting `otelcol.CollectorSettings.ResolverSettings.DefaultScheme` via the builder's `conf_resolver.default_uri_scheme` configuration option ([#​10296](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10296)) - `mdatagen`: add support for optional internal metrics ([#​10316](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10316)) - `otelcol/expandconverter`: Add `confmap.unifyEnvVarExpansion` feature gate to allow enabling Collector/Configuration SIG environment variable expansion rules. ([#​10391](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10391)) When enabled, this feature gate will: - Disable expansion of BASH-style env vars (`$FOO`) - `${FOO}` will be expanded as if it was \`${env:FOO} See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. - `confmap`: Add `confmap.unifyEnvVarExpansion` feature gate to allow enabling Collector/Configuration SIG environment variable expansion rules. ([#​10259](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10259)) When enabled, this feature gate will: - Disable expansion of BASH-style env vars (`$FOO`) - `${FOO}` will be expanded as if it was \`${env:FOO} See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. - `confighttp`: Allow the compression list to be overridden ([#​10295](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10295)) Allows Collector administrators to control which compression algorithms to enable for HTTP-based receivers. - `configgrpc`: Revert the zstd compression for gRPC to the third-party library we were using previously. ([#​10394](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10394)) We switched back to our compression logic for zstd when a CVE was found on the third-party library we were using. Now that the third-party library has been fixed, we can revert to that one. For end-users, this has no practical effect. The reproducers for the CVE were tested against this patch, confirming we are not reintroducing the bugs. - `confmap`: Adds alpha `confmap.strictlyTypedInput` feature gate that enables strict type checks during configuration resolution ([#​9532](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9532)) When enabled, the configuration resolution system will: - Stop doing most kinds of implicit type casting when resolving configuration values - Use the original string representation of configuration values if the ${} syntax is used in inline position - `confighttp`: Use `confighttp.ServerConfig` as part of zpagesextension. See \[https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/confighttp/README.md#server-configuration]\(server configuration) options. ([#​9368](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9368)) ##### 🧰 Bug fixes 🧰 - `exporterhelper`: Fix potential deadlock in the batch sender ([#​10315](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10315)) - `expandconverter`: Fix bug where an warning was logged incorrectly. ([#​10392](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10392)) - `exporterhelper`: Fix a bug when the retry and timeout logic was not applied with enabled batching. ([#​10166](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10166)) - `exporterhelper`: Fix a bug where an unstarted batch_sender exporter hangs on shutdown ([#​10306](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10306)) - `exporterhelper`: Fix small batch due to unfavorable goroutine scheduling in batch sender ([#​9952](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9952)) - `confmap`: Fix issue where structs with only yaml tags were not marshaled correctly. ([#​10282](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10282))
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- confmap/internal/e2e/go.mod | 4 ++-- internal/e2e/go.mod | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod index d1649893ed7..7bffda7c1a7 100644 --- a/confmap/internal/e2e/go.mod +++ b/confmap/internal/e2e/go.mod @@ -5,8 +5,8 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 go.opentelemetry.io/collector/featuregate v1.10.0 ) diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 46f7a87b83f..b695ab545dc 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -14,12 +14,12 @@ require ( go.opentelemetry.io/collector/confmap v0.103.0 go.opentelemetry.io/collector/consumer v0.103.0 go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1 + go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0 go.opentelemetry.io/collector/pdata v1.10.0 go.opentelemetry.io/collector/pdata/testdata v0.103.0 go.opentelemetry.io/collector/receiver v0.103.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0 go.uber.org/goleak v1.3.0 ) From 3611aecd44131c353d7e4faf72398ca341c0e53a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 10:30:35 -0700 Subject: [PATCH 088/168] Update github-actions deps (#10424) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/checkout](https://togithub.com/actions/checkout) | action | patch | `v4.1.6` -> `v4.1.7` | | [codecov/codecov-action](https://togithub.com/codecov/codecov-action) | action | minor | `4.4.1` -> `4.5.0` | | [github/codeql-action](https://togithub.com/github/codeql-action) | action | patch | `v3.25.8` -> `v3.25.10` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
actions/checkout (actions/checkout) ### [`v4.1.7`](https://togithub.com/actions/checkout/blob/HEAD/CHANGELOG.md#v417) [Compare Source](https://togithub.com/actions/checkout/compare/v4.1.6...v4.1.7) - Bump the minor-npm-dependencies group across 1 directory with 4 updates by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/actions/checkout/pull/1739](https://togithub.com/actions/checkout/pull/1739) - Bump actions/checkout from 3 to 4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/actions/checkout/pull/1697](https://togithub.com/actions/checkout/pull/1697) - Check out other refs/\* by commit by [@​orhantoy](https://togithub.com/orhantoy) in [https://github.com/actions/checkout/pull/1774](https://togithub.com/actions/checkout/pull/1774) - Pin actions/checkout's own workflows to a known, good, stable version. by [@​jww3](https://togithub.com/jww3) in [https://github.com/actions/checkout/pull/1776](https://togithub.com/actions/checkout/pull/1776)
codecov/codecov-action (codecov/codecov-action) ### [`v4.5.0`](https://togithub.com/codecov/codecov-action/compare/v4.4.1...v4.5.0) [Compare Source](https://togithub.com/codecov/codecov-action/compare/v4.4.1...v4.5.0)
github/codeql-action (github/codeql-action) ### [`v3.25.10`](https://togithub.com/github/codeql-action/compare/v3.25.9...v3.25.10) [Compare Source](https://togithub.com/github/codeql-action/compare/v3.25.9...v3.25.10) ### [`v3.25.9`](https://togithub.com/github/codeql-action/compare/v3.25.8...v3.25.9) [Compare Source](https://togithub.com/github/codeql-action/compare/v3.25.8...v3.25.9)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/api-compatibility.yml | 4 ++-- .github/workflows/build-and-test-arm.yml | 2 +- .github/workflows/build-and-test-windows.yaml | 4 ++-- .github/workflows/build-and-test.yml | 16 ++++++++-------- .github/workflows/builder-integration-test.yaml | 2 +- .github/workflows/builder-release.yaml | 2 +- .github/workflows/changelog.yml | 2 +- .github/workflows/check-goreleaser.yaml | 2 +- .github/workflows/check-links.yaml | 4 ++-- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/contrib-tests.yml | 2 +- .../generate-semantic-conventions-pr.yaml | 6 +++--- .github/workflows/perf.yml | 2 +- .github/workflows/prepare-release.yml | 2 +- .github/workflows/scorecard.yml | 4 ++-- .github/workflows/shellcheck.yml | 2 +- .github/workflows/tidy-dependencies.yml | 2 +- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/api-compatibility.yml b/.github/workflows/api-compatibility.yml index 3ba06a9f106..2e59a5bd16d 100644 --- a/.github/workflows/api-compatibility.yml +++ b/.github/workflows/api-compatibility.yml @@ -22,13 +22,13 @@ jobs: steps: - name: Checkout-Main - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: ref: ${{ github.base_ref }} path: ${{ github.base_ref }} - name: Checkout-HEAD - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: path: ${{ github.head_ref }} diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml index 6eae718ca9a..81bec877fcc 100644 --- a/.github/workflows/build-and-test-arm.yml +++ b/.github/workflows/build-and-test-arm.yml @@ -26,7 +26,7 @@ jobs: if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }} runs-on: actuated-arm64-4cpu-4gb steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version: "~1.22.4" diff --git a/.github/workflows/build-and-test-windows.yaml b/.github/workflows/build-and-test-windows.yaml index 66ab8b75dec..a208ad60720 100644 --- a/.github/workflows/build-and-test-windows.yaml +++ b/.github/workflows/build-and-test-windows.yaml @@ -18,7 +18,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: @@ -40,7 +40,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7d238d9aaeb..e0ca03dbd73 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: @@ -41,7 +41,7 @@ jobs: needs: [setup-environment] steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: @@ -65,7 +65,7 @@ jobs: timeout-minutes: 30 steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: @@ -90,7 +90,7 @@ jobs: needs: [setup-environment] steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: @@ -153,7 +153,7 @@ jobs: - name: Run vmmeter uses: self-actuated/vmmeter-action@c7e2162e39294a810cab647cacc215ecd68a44f6 # v1 - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: @@ -197,7 +197,7 @@ jobs: needs: [setup-environment] steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: @@ -219,7 +219,7 @@ jobs: - name: Run Unit Tests With Coverage run: make gotest-with-cover - name: Upload coverage report - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # 4.4.1 + uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # 4.5.0 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -259,7 +259,7 @@ jobs: steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/builder-integration-test.yaml b/.github/workflows/builder-integration-test.yaml index b95d0040899..affa488a210 100644 --- a/.github/workflows/builder-integration-test.yaml +++ b/.github/workflows/builder-integration-test.yaml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index ef54c8e4b6f..36e3d3e23b2 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 - name: Setup Go diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 0cc1ccbca9c..0fbf5ea0f7a 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -26,7 +26,7 @@ jobs: PR_HEAD: ${{ github.event.pull_request.head.sha }} steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 - name: Setup Go diff --git a/.github/workflows/check-goreleaser.yaml b/.github/workflows/check-goreleaser.yaml index 6f25384f229..62d9f26b063 100644 --- a/.github/workflows/check-goreleaser.yaml +++ b/.github/workflows/check-goreleaser.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 - name: Setup Go diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml index 55f4f466674..d7ce5c97691 100644 --- a/.github/workflows/check-links.yaml +++ b/.github/workflows/check-links.yaml @@ -21,7 +21,7 @@ jobs: md: ${{ steps.changes.outputs.md }} steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 - name: Get changed files @@ -34,7 +34,7 @@ jobs: if: ${{needs.changedfiles.outputs.md}} steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 59a27b39677..dc165869b8d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 @@ -30,12 +30,12 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 with: languages: go - name: Autobuild - uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 diff --git a/.github/workflows/contrib-tests.yml b/.github/workflows/contrib-tests.yml index e795bed94cb..7e8730158b2 100644 --- a/.github/workflows/contrib-tests.yml +++ b/.github/workflows/contrib-tests.yml @@ -38,7 +38,7 @@ jobs: - other steps: - name: Checkout Repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/generate-semantic-conventions-pr.yaml b/.github/workflows/generate-semantic-conventions-pr.yaml index 693d4a5b364..10c30d2830f 100644 --- a/.github/workflows/generate-semantic-conventions-pr.yaml +++ b/.github/workflows/generate-semantic-conventions-pr.yaml @@ -14,7 +14,7 @@ jobs: already-added: ${{ steps.check-versions.outputs.already-added }} already-opened: ${{ steps.check-versions.outputs.already-opened }} steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - id: check-versions name: Check versions @@ -55,9 +55,9 @@ jobs: needs: - check-versions steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Checkout semantic-convention - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: open-telemetry/semantic-conventions path: tmp-semantic-conventions diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index bf3935baec4..9b0a8be1a3a 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -11,7 +11,7 @@ jobs: runperf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 3433d0c539d..396a26d94cc 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -54,7 +54,7 @@ jobs: - validate-versions runs-on: ubuntu-latest steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 # Make sure that there are no open issues with release:blocker label in Core. The release has to be delayed until they are resolved. diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index cec755c6e73..e6a8986c378 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -29,7 +29,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false @@ -64,6 +64,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 with: sarif_file: results.sarif diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 1f048e48eb0..e4a759e5b2f 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -13,6 +13,6 @@ jobs: name: Shellcheck runs-on: ubuntu-latest steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Run ShellCheck uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0 diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index fd462b79e1d..3cd2b665446 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependency-major-update') && (github.actor == 'renovate[bot]' || contains(github.event.pull_request.labels.*.name, 'renovatebot')) }} steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: ref: ${{ github.head_ref }} - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 From 40a20a02a5629e3e071920de346197f1b5f0c6f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 10:32:00 -0700 Subject: [PATCH 089/168] Update module github.com/spf13/cobra to v1.8.1 (#10427) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/spf13/cobra](https://togithub.com/spf13/cobra) | `v1.8.0` -> `v1.8.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fspf13%2fcobra/v1.8.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fspf13%2fcobra/v1.8.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fspf13%2fcobra/v1.8.0/v1.8.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fspf13%2fcobra/v1.8.0/v1.8.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
spf13/cobra (github.com/spf13/cobra) ### [`v1.8.1`](https://togithub.com/spf13/cobra/releases/tag/v1.8.1) [Compare Source](https://togithub.com/spf13/cobra/compare/v1.8.0...v1.8.1) #### ✨ Features - Add env variable to suppress completion descriptions on create by [@​scop](https://togithub.com/scop) in [https://github.com/spf13/cobra/pull/1938](https://togithub.com/spf13/cobra/pull/1938) #### 🐛 Bug fixes - Micro-optimizations by [@​scop](https://togithub.com/scop) in [https://github.com/spf13/cobra/pull/1957](https://togithub.com/spf13/cobra/pull/1957) #### 🔧 Maintenance - build(deps): bump github.com/cpuguy83/go-md2man/v2 from 2.0.3 to 2.0.4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/spf13/cobra/pull/2127](https://togithub.com/spf13/cobra/pull/2127) - Consistent annotation names by [@​nirs](https://togithub.com/nirs) in [https://github.com/spf13/cobra/pull/2140](https://togithub.com/spf13/cobra/pull/2140) - Remove fully inactivated linters by [@​nirs](https://togithub.com/nirs) in [https://github.com/spf13/cobra/pull/2148](https://togithub.com/spf13/cobra/pull/2148) - Address golangci-lint deprecation warnings, enable some more linters by [@​scop](https://togithub.com/scop) in [https://github.com/spf13/cobra/pull/2152](https://togithub.com/spf13/cobra/pull/2152) #### 🧪 Testing & CI/CD - Add test for func in cobra.go by [@​korovindenis](https://togithub.com/korovindenis) in [https://github.com/spf13/cobra/pull/2094](https://togithub.com/spf13/cobra/pull/2094) - ci: test golang 1.22 by [@​cyrilico](https://togithub.com/cyrilico) in [https://github.com/spf13/cobra/pull/2113](https://togithub.com/spf13/cobra/pull/2113) - Optimized and added more linting by [@​scop](https://togithub.com/scop) in [https://github.com/spf13/cobra/pull/2099](https://togithub.com/spf13/cobra/pull/2099) - build(deps): bump actions/setup-go from 4 to 5 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/spf13/cobra/pull/2087](https://togithub.com/spf13/cobra/pull/2087) - build(deps): bump actions/labeler from 4 to 5 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/spf13/cobra/pull/2086](https://togithub.com/spf13/cobra/pull/2086) - build(deps): bump golangci/golangci-lint-action from 3.7.0 to 4.0.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/spf13/cobra/pull/2108](https://togithub.com/spf13/cobra/pull/2108) - build(deps): bump actions/cache from 3 to 4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/spf13/cobra/pull/2102](https://togithub.com/spf13/cobra/pull/2102) #### ✏️ Documentation - Fixes and docs for usage as plugin by [@​nirs](https://togithub.com/nirs) in [https://github.com/spf13/cobra/pull/2070](https://togithub.com/spf13/cobra/pull/2070) - flags: clarify documentation that LocalFlags related function do not modify the state by [@​niamster](https://togithub.com/niamster) in [https://github.com/spf13/cobra/pull/2064](https://togithub.com/spf13/cobra/pull/2064) - chore: remove repetitive words by [@​racerole](https://togithub.com/racerole) in [https://github.com/spf13/cobra/pull/2122](https://togithub.com/spf13/cobra/pull/2122) - Add LXC to the list of projects using Cobra [@​VaradBelwalkar](https://togithub.com/VaradBelwalkar) in [https://github.com/spf13/cobra/pull/2071](https://togithub.com/spf13/cobra/pull/2071) - Update projects_using_cobra.md by [@​marcuskohlberg](https://togithub.com/marcuskohlberg) in [https://github.com/spf13/cobra/pull/2089](https://togithub.com/spf13/cobra/pull/2089) - \[chore]: update projects using cobra by [@​cmwylie19](https://togithub.com/cmwylie19) in [https://github.com/spf13/cobra/pull/2093](https://togithub.com/spf13/cobra/pull/2093) - Add Taikun CLI to list of projects by [@​Smidra](https://togithub.com/Smidra) in [https://github.com/spf13/cobra/pull/2098](https://togithub.com/spf13/cobra/pull/2098) - Add Incus to the list of projects using Cobra by [@​montag451](https://togithub.com/montag451) in [https://github.com/spf13/cobra/pull/2118](https://togithub.com/spf13/cobra/pull/2118) #### New Contributors - [@​VaradBelwalkar](https://togithub.com/VaradBelwalkar) made their first contribution in [https://github.com/spf13/cobra/pull/2071](https://togithub.com/spf13/cobra/pull/2071) - [@​marcuskohlberg](https://togithub.com/marcuskohlberg) made their first contribution in [https://github.com/spf13/cobra/pull/2089](https://togithub.com/spf13/cobra/pull/2089) - [@​cmwylie19](https://togithub.com/cmwylie19) made their first contribution in [https://github.com/spf13/cobra/pull/2093](https://togithub.com/spf13/cobra/pull/2093) - [@​korovindenis](https://togithub.com/korovindenis) made their first contribution in [https://github.com/spf13/cobra/pull/2094](https://togithub.com/spf13/cobra/pull/2094) - [@​niamster](https://togithub.com/niamster) made their first contribution in [https://github.com/spf13/cobra/pull/2064](https://togithub.com/spf13/cobra/pull/2064) - [@​Smidra](https://togithub.com/Smidra) made their first contribution in [https://github.com/spf13/cobra/pull/2098](https://togithub.com/spf13/cobra/pull/2098) - [@​montag451](https://togithub.com/montag451) made their first contribution in [https://github.com/spf13/cobra/pull/2118](https://togithub.com/spf13/cobra/pull/2118) - [@​cyrilico](https://togithub.com/cyrilico) made their first contribution in [https://github.com/spf13/cobra/pull/2113](https://togithub.com/spf13/cobra/pull/2113) - [@​racerole](https://togithub.com/racerole) made their first contribution in [https://github.com/spf13/cobra/pull/2122](https://togithub.com/spf13/cobra/pull/2122) - [@​pedromotita](https://togithub.com/pedromotita) made their first contribution in [https://github.com/spf13/cobra/pull/2120](https://togithub.com/spf13/cobra/pull/2120) - [@​cubxxw](https://togithub.com/cubxxw) made their first contribution in [https://github.com/spf13/cobra/pull/2128](https://togithub.com/spf13/cobra/pull/2128) *** Thank you everyone who contributed to this release and all your hard work! Cobra and this community would never be possible without all of you!!!! 🐍 **Full Changelog**: https://github.com/spf13/cobra/compare/v1.8.0...v1.8.1
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/builder/go.mod | 2 +- cmd/builder/go.sum | 6 +++--- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 6 +++--- otelcol/go.mod | 2 +- otelcol/go.sum | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod index 697bad5f793..c123a51656c 100644 --- a/cmd/builder/go.mod +++ b/cmd/builder/go.mod @@ -12,7 +12,7 @@ require ( github.com/knadh/koanf/providers/file v0.1.0 github.com/knadh/koanf/providers/fs v0.1.0 github.com/knadh/koanf/v2 v2.1.1 - github.com/spf13/cobra v1.8.0 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 go.uber.org/goleak v1.3.0 diff --git a/cmd/builder/go.sum b/cmd/builder/go.sum index 113018644b5..9b4a5ff398e 100644 --- a/cmd/builder/go.sum +++ b/cmd/builder/go.sum @@ -1,4 +1,4 @@ -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= 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= @@ -40,8 +40,8 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 45a3afe8a8a..f74f17ea285 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -73,7 +73,7 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/shirou/gopsutil/v4 v4.24.5 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect - github.com/spf13/cobra v1.8.0 // indirect + github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index e50361cfa2d..3b871c4f05d 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -9,7 +9,7 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= @@ -120,8 +120,8 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/otelcol/go.mod b/otelcol/go.mod index 39c77603dea..9ad6a104267 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/otelcol go 1.21.0 require ( - github.com/spf13/cobra v1.8.0 + github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.103.0 go.opentelemetry.io/collector/component v0.103.0 diff --git a/otelcol/go.sum b/otelcol/go.sum index d78b15cb72b..b8b3519f520 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -9,7 +9,7 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= @@ -118,8 +118,8 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From dd103f12fee248157435664d034eddbe88bf74a1 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:05:21 -0700 Subject: [PATCH 090/168] [chore] revert tag trigger change (#10434) This causes the goreleaser and gh release steps to conflict as the goreleaser will create a release for the builder tag, and gh release will try to create the same. See https://github.com/open-telemetry/opentelemetry-collector/actions/runs/9568657405/job/26379389384 for more details Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/builder-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 36e3d3e23b2..5a704705a05 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -3,7 +3,7 @@ name: Builder - Release on: push: tags: - - 'cmd/builder/v*' + - 'v*' jobs: goreleaser: From a13835607bca67ed8fbaa25bd4acb99b4b3a5715 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:05:30 -0700 Subject: [PATCH 091/168] Update module github.com/klauspost/compress to v1.17.9 (#10425) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | `v1.17.8` -> `v1.17.9` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fklauspost%2fcompress/v1.17.9?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fklauspost%2fcompress/v1.17.9?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fklauspost%2fcompress/v1.17.8/v1.17.9?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fklauspost%2fcompress/v1.17.8/v1.17.9?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
klauspost/compress (github.com/klauspost/compress) ### [`v1.17.9`](https://togithub.com/klauspost/compress/releases/tag/v1.17.9) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.8...v1.17.9) ##### What's Changed - s2: Reduce ReadFrom temporary allocations by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/949](https://togithub.com/klauspost/compress/pull/949) - Fix arm64 vet issues by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/964](https://togithub.com/klauspost/compress/pull/964) - flate, zstd: Shave some bytes off amd64 matchLen by [@​greatroar](https://togithub.com/greatroar) in [https://github.com/klauspost/compress/pull/963](https://togithub.com/klauspost/compress/pull/963) - Upgrade zip to 1.22.4 upstream by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/970](https://togithub.com/klauspost/compress/pull/970) - zstd: BuildDict fails with RLE table by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/951](https://togithub.com/klauspost/compress/pull/951) - Upgrade zlib to upstream by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/971](https://togithub.com/klauspost/compress/pull/971) **Full Changelog**: https://github.com/klauspost/compress/compare/v1.17.8...v1.17.9
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- config/confighttp/go.mod | 2 +- config/confighttp/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- extension/zpagesextension/go.mod | 2 +- extension/zpagesextension/go.sum | 4 ++-- internal/e2e/go.mod | 2 +- internal/e2e/go.sum | 4 ++-- otelcol/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- service/go.mod | 2 +- service/go.sum | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index f74f17ea285..19864d8c1f6 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -55,7 +55,7 @@ require ( github.com/hashicorp/go-version v1.7.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect 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.1.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 3b871c4f05d..46e06caded3 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -71,8 +71,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 4956ad116a7..beb57170b41 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/golang/snappy v0.0.4 - github.com/klauspost/compress v1.17.8 + github.com/klauspost/compress v1.17.9 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.103.0 diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index 4e5620c8bca..26df72c63ec 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -27,8 +27,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index e553ac23beb..9611315bdcd 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -38,7 +38,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect 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.1.1 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 7099d300c45..56b8e4fce05 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -35,8 +35,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 7e965557c4d..39eac98fb79 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -32,7 +32,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect 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.1.1 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index ddebac0891e..f99258b79f4 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -33,8 +33,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index b695ab545dc..648508434b8 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -39,7 +39,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect 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.1.1 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 964202164de..dffd34940e9 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -35,8 +35,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/otelcol/go.sum b/otelcol/go.sum index b8b3519f520..f1d6ea68a95 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -71,8 +71,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 9c53fdafec5..07da9641f2d 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/gogo/protobuf v1.3.2 - github.com/klauspost/compress v1.17.8 + github.com/klauspost/compress v1.17.9 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.103.0 go.opentelemetry.io/collector/component v0.103.0 diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 964202164de..dffd34940e9 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -35,8 +35,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/service/go.mod b/service/go.mod index f5d30402540..f5367ba0e72 100644 --- a/service/go.mod +++ b/service/go.mod @@ -61,7 +61,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/compress v1.17.9 // indirect 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.1.1 // indirect diff --git a/service/go.sum b/service/go.sum index 516e5e848a1..44371c86699 100644 --- a/service/go.sum +++ b/service/go.sum @@ -68,8 +68,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= From ea7270cabaf972cb328116b5881be087117f8ff3 Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Wed, 19 Jun 2024 05:15:42 -0500 Subject: [PATCH 092/168] Add "inserted" metrics to processors (#10372) #### Link to tracking issue Resolves #10353 #### Testing Added equivalent testing to other processor metrics (accepted, refused, dropped). #### Documentation Metric documentation is autogenerated. #### Open Question My initial implementation includes a breaking change to `componenttest.TestTelemetry` which is public facing API. If we want to avoid an immediate breaking change in this test package, I would propose the following, which I can submit in a prerequisite PR: 1. Deprecate all `TestTelemetry.Check*` methods. 2. Replace with more granular `TestTelemetry.CheckOneSpecificMetric` methods. --- .chloggen/processorhelper-inserted-api.yaml | 25 ++++ .chloggen/processorhelper-inserted.yaml | 29 +++++ component/componenttest/obsreporttest.go | 12 +- .../componenttest/otelprometheuschecker.go | 18 +-- .../otelprometheuschecker_test.go | 6 +- .../testdata/prometheus_response | 9 ++ processor/processorhelper/documentation.md | 24 ++++ .../internal/metadata/generated_telemetry.go | 21 ++++ processor/processorhelper/metadata.yaml | 26 ++++- processor/processorhelper/obsreport.go | 41 +++++-- processor/processorhelper/obsreport_test.go | 109 ++++++++++++------ 11 files changed, 258 insertions(+), 62 deletions(-) create mode 100644 .chloggen/processorhelper-inserted-api.yaml create mode 100644 .chloggen/processorhelper-inserted.yaml diff --git a/.chloggen/processorhelper-inserted-api.yaml b/.chloggen/processorhelper-inserted-api.yaml new file mode 100644 index 00000000000..4ce25669388 --- /dev/null +++ b/.chloggen/processorhelper-inserted-api.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: component/componenttest + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Added additional "inserted" count to `TestTelemetry.CheckProcessor*` methods. + +# One or more tracking issues or pull requests related to the change +issues: [10353] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/.chloggen/processorhelper-inserted.yaml b/.chloggen/processorhelper-inserted.yaml new file mode 100644 index 00000000000..7ed6de7e864 --- /dev/null +++ b/.chloggen/processorhelper-inserted.yaml @@ -0,0 +1,29 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'enhancement' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: processorhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add "inserted" metrics for processors. + +# One or more tracking issues or pull requests related to the change +issues: [10353] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + This includes the following metrics for processors: + - `processor_inserted_spans` + - `processor_inserted_metric_points` + - `processor_inserted_log_records` + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/component/componenttest/obsreporttest.go b/component/componenttest/obsreporttest.go index f342879a533..ba076c65905 100644 --- a/component/componenttest/obsreporttest.go +++ b/component/componenttest/obsreporttest.go @@ -78,20 +78,20 @@ func (tts *TestTelemetry) CheckExporterMetricGauge(metric string, val int64) err // CheckProcessorTraces checks that for the current exported values for trace exporter metrics match given values. // When this function is called it is required to also call SetupTelemetry as first thing. -func (tts *TestTelemetry) CheckProcessorTraces(acceptedSpans, refusedSpans, droppedSpans int64) error { - return tts.prometheusChecker.checkProcessorTraces(tts.id, acceptedSpans, refusedSpans, droppedSpans) +func (tts *TestTelemetry) CheckProcessorTraces(acceptedSpans, refusedSpans, droppedSpans, insertedSpans int64) error { + return tts.prometheusChecker.checkProcessorTraces(tts.id, acceptedSpans, refusedSpans, droppedSpans, insertedSpans) } // CheckProcessorMetrics checks that for the current exported values for metrics exporter metrics match given values. // When this function is called it is required to also call SetupTelemetry as first thing. -func (tts *TestTelemetry) CheckProcessorMetrics(acceptedMetricPoints, refusedMetricPoints, droppedMetricPoints int64) error { - return tts.prometheusChecker.checkProcessorMetrics(tts.id, acceptedMetricPoints, refusedMetricPoints, droppedMetricPoints) +func (tts *TestTelemetry) CheckProcessorMetrics(acceptedMetricPoints, refusedMetricPoints, droppedMetricPoints, insertedMetricPoints int64) error { + return tts.prometheusChecker.checkProcessorMetrics(tts.id, acceptedMetricPoints, refusedMetricPoints, droppedMetricPoints, insertedMetricPoints) } // CheckProcessorLogs checks that for the current exported values for logs exporter metrics match given values. // When this function is called it is required to also call SetupTelemetry as first thing. -func (tts *TestTelemetry) CheckProcessorLogs(acceptedLogRecords, refusedLogRecords, droppedLogRecords int64) error { - return tts.prometheusChecker.checkProcessorLogs(tts.id, acceptedLogRecords, refusedLogRecords, droppedLogRecords) +func (tts *TestTelemetry) CheckProcessorLogs(acceptedLogRecords, refusedLogRecords, droppedLogRecords, insertedLogRecords int64) error { + return tts.prometheusChecker.checkProcessorLogs(tts.id, acceptedLogRecords, refusedLogRecords, droppedLogRecords, insertedLogRecords) } // CheckReceiverTraces checks that for the current exported values for trace receiver metrics match given values. diff --git a/component/componenttest/otelprometheuschecker.go b/component/componenttest/otelprometheuschecker.go index 5beef52373a..9dbe60384aa 100644 --- a/component/componenttest/otelprometheuschecker.go +++ b/component/componenttest/otelprometheuschecker.go @@ -48,24 +48,26 @@ func (pc *prometheusChecker) checkReceiver(receiver component.ID, datatype, prot pc.checkCounter(fmt.Sprintf("receiver_refused_%s", datatype), droppedMetricPoints, receiverAttrs)) } -func (pc *prometheusChecker) checkProcessorTraces(processor component.ID, accepted, refused, dropped int64) error { - return pc.checkProcessor(processor, "spans", accepted, refused, dropped) +func (pc *prometheusChecker) checkProcessorTraces(processor component.ID, accepted, refused, dropped, inserted int64) error { + return pc.checkProcessor(processor, "spans", accepted, refused, dropped, inserted) } -func (pc *prometheusChecker) checkProcessorMetrics(processor component.ID, accepted, refused, dropped int64) error { - return pc.checkProcessor(processor, "metric_points", accepted, refused, dropped) +func (pc *prometheusChecker) checkProcessorMetrics(processor component.ID, accepted, refused, dropped, inserted int64) error { + return pc.checkProcessor(processor, "metric_points", accepted, refused, dropped, inserted) } -func (pc *prometheusChecker) checkProcessorLogs(processor component.ID, accepted, refused, dropped int64) error { - return pc.checkProcessor(processor, "log_records", accepted, refused, dropped) +func (pc *prometheusChecker) checkProcessorLogs(processor component.ID, accepted, refused, dropped, inserted int64) error { + return pc.checkProcessor(processor, "log_records", accepted, refused, dropped, inserted) } -func (pc *prometheusChecker) checkProcessor(processor component.ID, datatype string, accepted, refused, dropped int64) error { +func (pc *prometheusChecker) checkProcessor(processor component.ID, datatype string, accepted, refused, dropped, inserted int64) error { processorAttrs := attributesForProcessorMetrics(processor) return multierr.Combine( pc.checkCounter(fmt.Sprintf("processor_accepted_%s", datatype), accepted, processorAttrs), pc.checkCounter(fmt.Sprintf("processor_refused_%s", datatype), refused, processorAttrs), - pc.checkCounter(fmt.Sprintf("processor_dropped_%s", datatype), dropped, processorAttrs)) + pc.checkCounter(fmt.Sprintf("processor_dropped_%s", datatype), dropped, processorAttrs), + pc.checkCounter(fmt.Sprintf("processor_inserted_%s", datatype), inserted, processorAttrs), + ) } func (pc *prometheusChecker) checkExporterTraces(exporter component.ID, sent, sendFailed int64) error { diff --git a/component/componenttest/otelprometheuschecker_test.go b/component/componenttest/otelprometheuschecker_test.go index d7176134f54..a2efb109355 100644 --- a/component/componenttest/otelprometheuschecker_test.go +++ b/component/componenttest/otelprometheuschecker_test.go @@ -88,17 +88,17 @@ func TestPromChecker(t *testing.T) { ) assert.NoError(t, - pc.checkProcessorTraces(processor, 42, 13, 7), + pc.checkProcessorTraces(processor, 42, 13, 7, 5), "metrics from Receiver Traces should be valid", ) assert.NoError(t, - pc.checkProcessorMetrics(processor, 7, 41, 13), + pc.checkProcessorMetrics(processor, 7, 41, 13, 4), "metrics from Receiver Metrics should be valid", ) assert.NoError(t, - pc.checkProcessorLogs(processor, 102, 35, 14), + pc.checkProcessorLogs(processor, 102, 35, 14, 3), "metrics from Receiver Logs should be valid", ) diff --git a/component/componenttest/testdata/prometheus_response b/component/componenttest/testdata/prometheus_response index fb954905988..09f1af71f46 100644 --- a/component/componenttest/testdata/prometheus_response +++ b/component/componenttest/testdata/prometheus_response @@ -25,6 +25,9 @@ processor_refused_spans{processor="fakeProcessor"} 13 # HELP processor_dropped_spans Number of spans that were dropped. # TYPE processor_dropped_spans counter processor_dropped_spans{processor="fakeProcessor"} 7 +# HELP processor_inserted_spans Number of spans that were inserted. +# TYPE processor_inserted_spans counter +processor_inserted_spans{processor="fakeProcessor"} 5 # HELP processor_accepted_metric_points Number of metric points successfully pushed into the next component in the pipeline. # TYPE processor_accepted_metric_points counter processor_accepted_metric_points{processor="fakeProcessor"} 7 @@ -34,6 +37,9 @@ processor_refused_metric_points{processor="fakeProcessor"} 41 # HELP processor_dropped_metric_points Number of metric points that were dropped. # TYPE processor_dropped_metric_points counter processor_dropped_metric_points{processor="fakeProcessor"} 13 +# HELP processor_inserted_metric_points Number of metric points that were inserted. +# TYPE processor_inserted_metric_points counter +processor_inserted_metric_points{processor="fakeProcessor"} 4 # HELP processor_accepted_log_records Number of log records successfully pushed into the next component in the pipeline. # TYPE processor_accepted_log_records counter processor_accepted_log_records{processor="fakeProcessor"} 102 @@ -43,6 +49,9 @@ processor_refused_log_records{processor="fakeProcessor"} 35 # HELP processor_dropped_log_records Number of log records that were dropped. # TYPE processor_dropped_log_records counter processor_dropped_log_records{processor="fakeProcessor"} 14 +# HELP processor_inserted_log_records Number of log records that were inserted. +# TYPE processor_inserted_log_records counter +processor_inserted_log_records{processor="fakeProcessor"} 3 # HELP receiver_accepted_log_records Number of log records successfully pushed into the pipeline. # TYPE receiver_accepted_log_records counter receiver_accepted_log_records{receiver="fakeReceiver",transport="fakeTransport"} 102 diff --git a/processor/processorhelper/documentation.md b/processor/processorhelper/documentation.md index 073fc9a7219..bdd45b6ff18 100644 --- a/processor/processorhelper/documentation.md +++ b/processor/processorhelper/documentation.md @@ -54,6 +54,30 @@ Number of spans that were dropped. | ---- | ----------- | ---------- | --------- | | 1 | Sum | Int | true | +### processor_inserted_log_records + +Number of log records that were inserted. + +| Unit | Metric Type | Value Type | Monotonic | +| ---- | ----------- | ---------- | --------- | +| 1 | Sum | Int | true | + +### processor_inserted_metric_points + +Number of metric points that were inserted. + +| Unit | Metric Type | Value Type | Monotonic | +| ---- | ----------- | ---------- | --------- | +| 1 | Sum | Int | true | + +### processor_inserted_spans + +Number of spans that were inserted. + +| Unit | Metric Type | Value Type | Monotonic | +| ---- | ----------- | ---------- | --------- | +| 1 | Sum | Int | true | + ### processor_refused_log_records Number of log records that were rejected by the next component in the pipeline. diff --git a/processor/processorhelper/internal/metadata/generated_telemetry.go b/processor/processorhelper/internal/metadata/generated_telemetry.go index 94d738f4a63..df28bde4d58 100644 --- a/processor/processorhelper/internal/metadata/generated_telemetry.go +++ b/processor/processorhelper/internal/metadata/generated_telemetry.go @@ -31,6 +31,9 @@ type TelemetryBuilder struct { ProcessorDroppedLogRecords metric.Int64Counter ProcessorDroppedMetricPoints metric.Int64Counter ProcessorDroppedSpans metric.Int64Counter + ProcessorInsertedLogRecords metric.Int64Counter + ProcessorInsertedMetricPoints metric.Int64Counter + ProcessorInsertedSpans metric.Int64Counter ProcessorRefusedLogRecords metric.Int64Counter ProcessorRefusedMetricPoints metric.Int64Counter ProcessorRefusedSpans metric.Int64Counter @@ -96,6 +99,24 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme metric.WithUnit("1"), ) errs = errors.Join(errs, err) + builder.ProcessorInsertedLogRecords, err = builder.meter.Int64Counter( + "processor_inserted_log_records", + metric.WithDescription("Number of log records that were inserted."), + metric.WithUnit("1"), + ) + errs = errors.Join(errs, err) + builder.ProcessorInsertedMetricPoints, err = builder.meter.Int64Counter( + "processor_inserted_metric_points", + metric.WithDescription("Number of metric points that were inserted."), + metric.WithUnit("1"), + ) + errs = errors.Join(errs, err) + builder.ProcessorInsertedSpans, err = builder.meter.Int64Counter( + "processor_inserted_spans", + metric.WithDescription("Number of spans that were inserted."), + metric.WithUnit("1"), + ) + errs = errors.Join(errs, err) builder.ProcessorRefusedLogRecords, err = builder.meter.Int64Counter( "processor_refused_log_records", metric.WithDescription("Number of log records that were rejected by the next component in the pipeline."), diff --git a/processor/processorhelper/metadata.yaml b/processor/processorhelper/metadata.yaml index 7e0c72f5c9c..2b6ec764d1e 100644 --- a/processor/processorhelper/metadata.yaml +++ b/processor/processorhelper/metadata.yaml @@ -33,6 +33,14 @@ telemetry: value_type: int monotonic: true + processor_inserted_spans: + enabled: true + description: Number of spans that were inserted. + unit: 1 + sum: + value_type: int + monotonic: true + processor_accepted_metric_points: enabled: true description: Number of metric points successfully pushed into the next component in the pipeline. @@ -57,6 +65,14 @@ telemetry: value_type: int monotonic: true + processor_inserted_metric_points: + enabled: true + description: Number of metric points that were inserted. + unit: 1 + sum: + value_type: int + monotonic: true + processor_accepted_log_records: enabled: true description: Number of log records successfully pushed into the next component in the pipeline. @@ -79,4 +95,12 @@ telemetry: unit: 1 sum: value_type: int - monotonic: true \ No newline at end of file + monotonic: true + + processor_inserted_log_records: + enabled: true + description: Number of log records that were inserted. + unit: 1 + sum: + value_type: int + monotonic: true diff --git a/processor/processorhelper/obsreport.go b/processor/processorhelper/obsreport.go index ad46303da6b..2a3bd0dc754 100644 --- a/processor/processorhelper/obsreport.go +++ b/processor/processorhelper/obsreport.go @@ -60,69 +60,88 @@ func newObsReport(cfg ObsReportSettings) (*ObsReport, error) { }, nil } -func (or *ObsReport) recordData(ctx context.Context, dataType component.DataType, accepted, refused, dropped int64) { - var acceptedCount, refusedCount, droppedCount metric.Int64Counter +func (or *ObsReport) recordData(ctx context.Context, dataType component.DataType, accepted, refused, dropped, inserted int64) { + var acceptedCount, refusedCount, droppedCount, insertedCount metric.Int64Counter switch dataType { case component.DataTypeTraces: acceptedCount = or.telemetryBuilder.ProcessorAcceptedSpans refusedCount = or.telemetryBuilder.ProcessorRefusedSpans droppedCount = or.telemetryBuilder.ProcessorDroppedSpans + insertedCount = or.telemetryBuilder.ProcessorInsertedSpans case component.DataTypeMetrics: acceptedCount = or.telemetryBuilder.ProcessorAcceptedMetricPoints refusedCount = or.telemetryBuilder.ProcessorRefusedMetricPoints droppedCount = or.telemetryBuilder.ProcessorDroppedMetricPoints + insertedCount = or.telemetryBuilder.ProcessorInsertedMetricPoints case component.DataTypeLogs: acceptedCount = or.telemetryBuilder.ProcessorAcceptedLogRecords refusedCount = or.telemetryBuilder.ProcessorRefusedLogRecords droppedCount = or.telemetryBuilder.ProcessorDroppedLogRecords + insertedCount = or.telemetryBuilder.ProcessorInsertedLogRecords } acceptedCount.Add(ctx, accepted, metric.WithAttributes(or.otelAttrs...)) refusedCount.Add(ctx, refused, metric.WithAttributes(or.otelAttrs...)) droppedCount.Add(ctx, dropped, metric.WithAttributes(or.otelAttrs...)) + insertedCount.Add(ctx, inserted, metric.WithAttributes(or.otelAttrs...)) } // TracesAccepted reports that the trace data was accepted. func (or *ObsReport) TracesAccepted(ctx context.Context, numSpans int) { - or.recordData(ctx, component.DataTypeTraces, int64(numSpans), int64(0), int64(0)) + or.recordData(ctx, component.DataTypeTraces, int64(numSpans), int64(0), int64(0), int64(0)) } // TracesRefused reports that the trace data was refused. func (or *ObsReport) TracesRefused(ctx context.Context, numSpans int) { - or.recordData(ctx, component.DataTypeTraces, int64(0), int64(numSpans), int64(0)) + or.recordData(ctx, component.DataTypeTraces, int64(0), int64(numSpans), int64(0), int64(0)) } // TracesDropped reports that the trace data was dropped. func (or *ObsReport) TracesDropped(ctx context.Context, numSpans int) { - or.recordData(ctx, component.DataTypeTraces, int64(0), int64(0), int64(numSpans)) + or.recordData(ctx, component.DataTypeTraces, int64(0), int64(0), int64(numSpans), int64(0)) +} + +// TracesInserted reports that the trace data was inserted. +func (or *ObsReport) TracesInserted(ctx context.Context, numSpans int) { + or.recordData(ctx, component.DataTypeTraces, int64(0), int64(0), int64(0), int64(numSpans)) } // MetricsAccepted reports that the metrics were accepted. func (or *ObsReport) MetricsAccepted(ctx context.Context, numPoints int) { - or.recordData(ctx, component.DataTypeMetrics, int64(numPoints), int64(0), int64(0)) + or.recordData(ctx, component.DataTypeMetrics, int64(numPoints), int64(0), int64(0), int64(0)) } // MetricsRefused reports that the metrics were refused. func (or *ObsReport) MetricsRefused(ctx context.Context, numPoints int) { - or.recordData(ctx, component.DataTypeMetrics, int64(0), int64(numPoints), int64(0)) + or.recordData(ctx, component.DataTypeMetrics, int64(0), int64(numPoints), int64(0), int64(0)) } // MetricsDropped reports that the metrics were dropped. func (or *ObsReport) MetricsDropped(ctx context.Context, numPoints int) { - or.recordData(ctx, component.DataTypeMetrics, int64(0), int64(0), int64(numPoints)) + or.recordData(ctx, component.DataTypeMetrics, int64(0), int64(0), int64(numPoints), int64(0)) +} + +// MetricsInserted reports that the metrics were inserted. +func (or *ObsReport) MetricsInserted(ctx context.Context, numPoints int) { + or.recordData(ctx, component.DataTypeMetrics, int64(0), int64(0), int64(0), int64(numPoints)) } // LogsAccepted reports that the logs were accepted. func (or *ObsReport) LogsAccepted(ctx context.Context, numRecords int) { - or.recordData(ctx, component.DataTypeLogs, int64(numRecords), int64(0), int64(0)) + or.recordData(ctx, component.DataTypeLogs, int64(numRecords), int64(0), int64(0), int64(0)) } // LogsRefused reports that the logs were refused. func (or *ObsReport) LogsRefused(ctx context.Context, numRecords int) { - or.recordData(ctx, component.DataTypeLogs, int64(0), int64(numRecords), int64(0)) + or.recordData(ctx, component.DataTypeLogs, int64(0), int64(numRecords), int64(0), int64(0)) } // LogsDropped reports that the logs were dropped. func (or *ObsReport) LogsDropped(ctx context.Context, numRecords int) { - or.recordData(ctx, component.DataTypeLogs, int64(0), int64(0), int64(numRecords)) + or.recordData(ctx, component.DataTypeLogs, int64(0), int64(0), int64(numRecords), int64(0)) +} + +// LogsInserted reports that the logs were inserted. +func (or *ObsReport) LogsInserted(ctx context.Context, numRecords int) { + or.recordData(ctx, component.DataTypeLogs, int64(0), int64(0), int64(0), int64(numRecords)) } diff --git a/processor/processorhelper/obsreport_test.go b/processor/processorhelper/obsreport_test.go index 52da51007a4..57ae4d04184 100644 --- a/processor/processorhelper/obsreport_test.go +++ b/processor/processorhelper/obsreport_test.go @@ -25,6 +25,8 @@ func TestProcessorTraceData(t *testing.T) { const acceptedSpans = 27 const refusedSpans = 19 const droppedSpans = 13 + const insertedSpans = 5 + obsrep, err := newObsReport(ObsReportSettings{ ProcessorID: processorID, ProcessorCreateSettings: processor.Settings{ID: processorID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}, @@ -33,8 +35,9 @@ func TestProcessorTraceData(t *testing.T) { obsrep.TracesAccepted(context.Background(), acceptedSpans) obsrep.TracesRefused(context.Background(), refusedSpans) obsrep.TracesDropped(context.Background(), droppedSpans) + obsrep.TracesInserted(context.Background(), insertedSpans) - require.NoError(t, tt.CheckProcessorTraces(acceptedSpans, refusedSpans, droppedSpans)) + require.NoError(t, tt.CheckProcessorTraces(acceptedSpans, refusedSpans, droppedSpans, insertedSpans)) }) } @@ -43,6 +46,7 @@ func TestProcessorMetricsData(t *testing.T) { const acceptedPoints = 29 const refusedPoints = 11 const droppedPoints = 17 + const insertedPoints = 4 obsrep, err := newObsReport(ObsReportSettings{ ProcessorID: processorID, @@ -52,8 +56,9 @@ func TestProcessorMetricsData(t *testing.T) { obsrep.MetricsAccepted(context.Background(), acceptedPoints) obsrep.MetricsRefused(context.Background(), refusedPoints) obsrep.MetricsDropped(context.Background(), droppedPoints) + obsrep.MetricsInserted(context.Background(), insertedPoints) - require.NoError(t, tt.CheckProcessorMetrics(acceptedPoints, refusedPoints, droppedPoints)) + require.NoError(t, tt.CheckProcessorMetrics(acceptedPoints, refusedPoints, droppedPoints, insertedPoints)) }) } @@ -84,6 +89,7 @@ func TestProcessorLogRecords(t *testing.T) { const acceptedRecords = 29 const refusedRecords = 11 const droppedRecords = 17 + const insertedRecords = 3 obsrep, err := newObsReport(ObsReportSettings{ ProcessorID: processorID, @@ -93,8 +99,9 @@ func TestProcessorLogRecords(t *testing.T) { obsrep.LogsAccepted(context.Background(), acceptedRecords) obsrep.LogsRefused(context.Background(), refusedRecords) obsrep.LogsDropped(context.Background(), droppedRecords) + obsrep.LogsInserted(context.Background(), insertedRecords) - require.NoError(t, tt.CheckProcessorLogs(acceptedRecords, refusedRecords, droppedRecords)) + require.NoError(t, tt.CheckProcessorLogs(acceptedRecords, refusedRecords, droppedRecords, insertedRecords)) }) } @@ -112,15 +119,24 @@ func TestCheckProcessorTracesViews(t *testing.T) { por.TracesAccepted(context.Background(), 7) por.TracesRefused(context.Background(), 8) por.TracesDropped(context.Background(), 9) - - assert.NoError(t, tt.CheckProcessorTraces(7, 8, 9)) - assert.Error(t, tt.CheckProcessorTraces(0, 0, 0)) - assert.Error(t, tt.CheckProcessorTraces(7, 0, 0)) - assert.Error(t, tt.CheckProcessorTraces(7, 8, 0)) - assert.Error(t, tt.CheckProcessorTraces(7, 0, 9)) - assert.Error(t, tt.CheckProcessorTraces(0, 8, 0)) - assert.Error(t, tt.CheckProcessorTraces(0, 8, 9)) - assert.Error(t, tt.CheckProcessorTraces(0, 0, 9)) + por.TracesInserted(context.Background(), 10) + + assert.NoError(t, tt.CheckProcessorTraces(7, 8, 9, 10)) + assert.Error(t, tt.CheckProcessorTraces(0, 0, 0, 0)) + assert.Error(t, tt.CheckProcessorTraces(7, 0, 0, 0)) + assert.Error(t, tt.CheckProcessorTraces(0, 8, 0, 0)) + assert.Error(t, tt.CheckProcessorTraces(0, 0, 9, 0)) + assert.Error(t, tt.CheckProcessorTraces(0, 0, 0, 10)) + assert.Error(t, tt.CheckProcessorTraces(7, 8, 0, 0)) + assert.Error(t, tt.CheckProcessorTraces(7, 0, 9, 0)) + assert.Error(t, tt.CheckProcessorTraces(7, 0, 0, 10)) + assert.Error(t, tt.CheckProcessorTraces(0, 8, 9, 0)) + assert.Error(t, tt.CheckProcessorTraces(0, 8, 0, 10)) + assert.Error(t, tt.CheckProcessorTraces(0, 0, 9, 10)) + assert.Error(t, tt.CheckProcessorTraces(7, 8, 9, 0)) + assert.Error(t, tt.CheckProcessorTraces(7, 8, 0, 10)) + assert.Error(t, tt.CheckProcessorTraces(7, 0, 9, 10)) + assert.Error(t, tt.CheckProcessorTraces(0, 8, 9, 10)) } func TestCheckProcessorMetricsViews(t *testing.T) { @@ -137,15 +153,24 @@ func TestCheckProcessorMetricsViews(t *testing.T) { por.MetricsAccepted(context.Background(), 7) por.MetricsRefused(context.Background(), 8) por.MetricsDropped(context.Background(), 9) - - assert.NoError(t, tt.CheckProcessorMetrics(7, 8, 9)) - assert.Error(t, tt.CheckProcessorMetrics(0, 0, 0)) - assert.Error(t, tt.CheckProcessorMetrics(7, 0, 0)) - assert.Error(t, tt.CheckProcessorMetrics(7, 8, 0)) - assert.Error(t, tt.CheckProcessorMetrics(7, 0, 9)) - assert.Error(t, tt.CheckProcessorMetrics(0, 8, 0)) - assert.Error(t, tt.CheckProcessorMetrics(0, 8, 9)) - assert.Error(t, tt.CheckProcessorMetrics(0, 0, 9)) + por.MetricsInserted(context.Background(), 10) + + assert.NoError(t, tt.CheckProcessorMetrics(7, 8, 9, 10)) + assert.Error(t, tt.CheckProcessorMetrics(0, 0, 0, 0)) + assert.Error(t, tt.CheckProcessorMetrics(7, 0, 0, 0)) + assert.Error(t, tt.CheckProcessorMetrics(0, 8, 0, 0)) + assert.Error(t, tt.CheckProcessorMetrics(0, 0, 9, 0)) + assert.Error(t, tt.CheckProcessorMetrics(0, 0, 0, 10)) + assert.Error(t, tt.CheckProcessorMetrics(7, 8, 0, 0)) + assert.Error(t, tt.CheckProcessorMetrics(7, 0, 9, 0)) + assert.Error(t, tt.CheckProcessorMetrics(7, 0, 0, 10)) + assert.Error(t, tt.CheckProcessorMetrics(0, 8, 9, 0)) + assert.Error(t, tt.CheckProcessorMetrics(0, 8, 0, 10)) + assert.Error(t, tt.CheckProcessorMetrics(0, 0, 9, 10)) + assert.Error(t, tt.CheckProcessorMetrics(7, 8, 9, 0)) + assert.Error(t, tt.CheckProcessorMetrics(7, 8, 0, 10)) + assert.Error(t, tt.CheckProcessorMetrics(7, 0, 9, 10)) + assert.Error(t, tt.CheckProcessorMetrics(0, 8, 9, 10)) } func TestCheckProcessorLogViews(t *testing.T) { @@ -162,15 +187,24 @@ func TestCheckProcessorLogViews(t *testing.T) { por.LogsAccepted(context.Background(), 7) por.LogsRefused(context.Background(), 8) por.LogsDropped(context.Background(), 9) - - assert.NoError(t, tt.CheckProcessorLogs(7, 8, 9)) - assert.Error(t, tt.CheckProcessorLogs(0, 0, 0)) - assert.Error(t, tt.CheckProcessorLogs(7, 0, 0)) - assert.Error(t, tt.CheckProcessorLogs(7, 8, 0)) - assert.Error(t, tt.CheckProcessorLogs(7, 0, 9)) - assert.Error(t, tt.CheckProcessorLogs(0, 8, 0)) - assert.Error(t, tt.CheckProcessorLogs(0, 8, 9)) - assert.Error(t, tt.CheckProcessorLogs(0, 0, 9)) + por.LogsInserted(context.Background(), 10) + + assert.NoError(t, tt.CheckProcessorLogs(7, 8, 9, 10)) + assert.Error(t, tt.CheckProcessorLogs(0, 0, 0, 0)) + assert.Error(t, tt.CheckProcessorLogs(7, 0, 0, 0)) + assert.Error(t, tt.CheckProcessorLogs(0, 8, 0, 0)) + assert.Error(t, tt.CheckProcessorLogs(0, 0, 9, 0)) + assert.Error(t, tt.CheckProcessorLogs(0, 0, 0, 10)) + assert.Error(t, tt.CheckProcessorLogs(7, 8, 0, 0)) + assert.Error(t, tt.CheckProcessorLogs(7, 0, 9, 0)) + assert.Error(t, tt.CheckProcessorLogs(7, 0, 0, 10)) + assert.Error(t, tt.CheckProcessorLogs(0, 8, 9, 0)) + assert.Error(t, tt.CheckProcessorLogs(0, 8, 0, 10)) + assert.Error(t, tt.CheckProcessorLogs(0, 0, 9, 10)) + assert.Error(t, tt.CheckProcessorLogs(7, 8, 9, 0)) + assert.Error(t, tt.CheckProcessorLogs(7, 8, 0, 10)) + assert.Error(t, tt.CheckProcessorLogs(7, 0, 9, 10)) + assert.Error(t, tt.CheckProcessorLogs(0, 8, 9, 10)) } func TestNoMetrics(t *testing.T) { @@ -179,6 +213,8 @@ func TestNoMetrics(t *testing.T) { const accepted = 29 const refused = 11 const dropped = 17 + const inserted = 5 + set := tt.TelemetrySettings() set.MetricsLevel = configtelemetry.LevelNone @@ -191,13 +227,16 @@ func TestNoMetrics(t *testing.T) { por.TracesAccepted(context.Background(), accepted) por.TracesRefused(context.Background(), refused) por.TracesDropped(context.Background(), dropped) + por.TracesInserted(context.Background(), inserted) - require.Error(t, tt.CheckProcessorTraces(accepted, refused, dropped)) + require.Error(t, tt.CheckProcessorTraces(accepted, refused, dropped, inserted)) }) testTelemetry(t, processorID, func(t *testing.T, tt componenttest.TestTelemetry) { const accepted = 29 const refused = 11 const dropped = 17 + const inserted = 4 + set := tt.TelemetrySettings() set.MetricsLevel = configtelemetry.LevelNone @@ -210,13 +249,16 @@ func TestNoMetrics(t *testing.T) { por.MetricsAccepted(context.Background(), accepted) por.MetricsRefused(context.Background(), refused) por.MetricsDropped(context.Background(), dropped) + por.MetricsInserted(context.Background(), inserted) - require.Error(t, tt.CheckProcessorMetrics(accepted, refused, dropped)) + require.Error(t, tt.CheckProcessorMetrics(accepted, refused, dropped, inserted)) }) testTelemetry(t, processorID, func(t *testing.T, tt componenttest.TestTelemetry) { const accepted = 29 const refused = 11 const dropped = 17 + const inserted = 3 + set := tt.TelemetrySettings() set.MetricsLevel = configtelemetry.LevelNone @@ -229,8 +271,9 @@ func TestNoMetrics(t *testing.T) { por.LogsAccepted(context.Background(), accepted) por.LogsRefused(context.Background(), refused) por.LogsDropped(context.Background(), dropped) + por.LogsInserted(context.Background(), inserted) - require.Error(t, tt.CheckProcessorLogs(accepted, refused, dropped)) + require.Error(t, tt.CheckProcessorLogs(accepted, refused, dropped, inserted)) }) } From 54de6e631d99dd872299481a736564a91028f322 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Wed, 19 Jun 2024 11:09:48 -0700 Subject: [PATCH 093/168] [filter] remove deprecated `filter.CombinedFilter` (#10362) #### Description Remove deprecated CombinedFilter. This can be merged after the v0.103.0 release. Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .chloggen/combinedfilter_remove.yaml | 25 +++++++++++++++++++++++++ filter/config.go | 3 --- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 .chloggen/combinedfilter_remove.yaml diff --git a/.chloggen/combinedfilter_remove.yaml b/.chloggen/combinedfilter_remove.yaml new file mode 100644 index 00000000000..132bd127a79 --- /dev/null +++ b/.chloggen/combinedfilter_remove.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: filter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove deprecated `filter.CombinedFilter` + +# One or more tracking issues or pull requests related to the change +issues: [10348] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/filter/config.go b/filter/config.go index 0fc63c86825..3b0a378a4ba 100644 --- a/filter/config.go +++ b/filter/config.go @@ -37,9 +37,6 @@ type combinedFilter struct { regexes []*regexp.Regexp } -// Deprecated: [v0.103.0] This type will be removed in the future. -type CombinedFilter combinedFilter - // CreateFilter creates a Filter out of a set of Config configuration objects. func CreateFilter(configs []Config) Filter { cf := &combinedFilter{ From 149ded2ad33df6341a00ae8bd107fcff00bff276 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Wed, 19 Jun 2024 14:32:28 -0700 Subject: [PATCH 094/168] Print Span.TraceState() in debugexporter (#10421) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Description Span.TraceState() is not printed, but is a part of the OTel span data model. #### Link to tracking issue Part of https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/31918 #### Testing ✅ --- .chloggen/print-tracestate.yaml | 25 +++++++++++++++++++ .../otlptext/testdata/traces/two_spans.out | 1 + exporter/internal/otlptext/traces.go | 3 +++ pdata/testdata/trace.go | 1 + 4 files changed, 30 insertions(+) create mode 100644 .chloggen/print-tracestate.yaml diff --git a/.chloggen/print-tracestate.yaml b/.chloggen/print-tracestate.yaml new file mode 100644 index 00000000000..ccb9f650984 --- /dev/null +++ b/.chloggen/print-tracestate.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: debugexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Print Span.TraceState() when present. + +# One or more tracking issues or pull requests related to the change +issues: [10421] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: Enables viewing sampling threshold information (as by OTEP 235 samplers). + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/exporter/internal/otlptext/testdata/traces/two_spans.out b/exporter/internal/otlptext/testdata/traces/two_spans.out index c8f7f8e8514..9cb3ac75038 100644 --- a/exporter/internal/otlptext/testdata/traces/two_spans.out +++ b/exporter/internal/otlptext/testdata/traces/two_spans.out @@ -11,6 +11,7 @@ Span #0 ID : 1112131415161718 Name : operationA Kind : Unspecified + TraceState : ot=th:0 Start time : 2020-02-11 20:26:12.000000321 +0000 UTC End time : 2020-02-11 20:26:13.000000789 +0000 UTC Status code : Error diff --git a/exporter/internal/otlptext/traces.go b/exporter/internal/otlptext/traces.go index 8332a842e34..5d09a08ebad 100644 --- a/exporter/internal/otlptext/traces.go +++ b/exporter/internal/otlptext/traces.go @@ -39,6 +39,9 @@ func (textTracesMarshaler) MarshalTraces(td ptrace.Traces) ([]byte, error) { buf.logAttr("ID", span.SpanID()) buf.logAttr("Name", span.Name()) buf.logAttr("Kind", span.Kind().String()) + if ts := span.TraceState().AsRaw(); len(ts) != 0 { + buf.logAttr("TraceState", ts) + } buf.logAttr("Start time", span.StartTimestamp().String()) buf.logAttr("End time", span.EndTimestamp().String()) diff --git a/pdata/testdata/trace.go b/pdata/testdata/trace.go index 3d69ed3a425..779430af666 100644 --- a/pdata/testdata/trace.go +++ b/pdata/testdata/trace.go @@ -37,6 +37,7 @@ func fillSpanOne(span ptrace.Span) { span.SetStartTimestamp(spanStartTimestamp) span.SetEndTimestamp(spanEndTimestamp) span.SetDroppedAttributesCount(1) + span.TraceState().FromRaw("ot=th:0") // 100% sampling span.SetTraceID([16]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10}) span.SetSpanID([8]byte{0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}) evs := span.Events() From 05a2844bdb4f4483efed9eca9c3d6e54c859ebaa Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Thu, 20 Jun 2024 04:45:23 -0500 Subject: [PATCH 095/168] Docs - Update contrib release step 1 (#10439) When I performed this step yesterday, I found that it was necessary to update the builder configs first, otherwise `make update-otel` would fail. This PR just updates the order of operations to match what worked for me. --- docs/release.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/release.md b/docs/release.md index e14058ed733..bba9ef21777 100644 --- a/docs/release.md +++ b/docs/release.md @@ -53,11 +53,13 @@ It is possible that a core approver isn't a contrib approver. In that case, the ## Releasing opentelemetry-collector-contrib 1. Open a PR to Contrib to use the newly released Core version and set it to Ready for Review. - - Run `make update-otel OTEL_VERSION=v0.85.0 OTEL_STABLE_VERSION=v1.1.0` - Manually update `cmd/otelcontribcol/builder-config.yaml` - Manually update `cmd/oteltestbedcol/builder-config.yaml` - - Run `make genotelcontribcol` - - Push updates to the PR + - Run `make genotelcontribcol genoteltestbedcol` + - Commit the changes + - Run `make update-otel OTEL_VERSION=v0.85.0 OTEL_STABLE_VERSION=v1.1.0` + - Commit the changes + - Open a PR - 🛑 **Do not move forward until this PR is merged.** 🛑 2. Manually run the action [Automation - Prepare Release](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/workflows/prepare-release.yml). When prompted, enter the version numbers determined in Step 1, but do not include a leading `v`. This action will create a pull request to update the changelog and version numbers in the repo. **While this PR is open all merging in Contrib should be halted**. From 72c23aa5d79b995a8f0577b5fe6f30879341ea85 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 20 Jun 2024 08:51:54 -0700 Subject: [PATCH 096/168] [configretry] Mark as stable (#10341) #### Description Mark module as stable. #### Link to tracking issue Fixes #10279 --- .chloggen/move_configretry_stable.yaml | 25 +++++++++++++++++++++++++ versions.yaml | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 .chloggen/move_configretry_stable.yaml diff --git a/.chloggen/move_configretry_stable.yaml b/.chloggen/move_configretry_stable.yaml new file mode 100644 index 00000000000..a237decc028 --- /dev/null +++ b/.chloggen/move_configretry_stable.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: configretry + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Mark module as stable. + +# One or more tracking issues or pull requests related to the change +issues: [10279] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/versions.yaml b/versions.yaml index 363f831f43c..8545cbde46f 100644 --- a/versions.yaml +++ b/versions.yaml @@ -9,6 +9,7 @@ module-sets: - go.opentelemetry.io/collector/pdata - go.opentelemetry.io/collector/config/configopaque - go.opentelemetry.io/collector/config/configcompression + - go.opentelemetry.io/collector/config/configretry beta: version: v0.103.0 modules: @@ -27,7 +28,6 @@ module-sets: - go.opentelemetry.io/collector/config/configgrpc - go.opentelemetry.io/collector/config/confighttp - go.opentelemetry.io/collector/config/confignet - - go.opentelemetry.io/collector/config/configretry - go.opentelemetry.io/collector/config/configtelemetry - go.opentelemetry.io/collector/config/configtls - go.opentelemetry.io/collector/config/internal From 8022caa3371624c8ea11a28b56c0a1e9e27a464c Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 20 Jun 2024 09:15:23 -0700 Subject: [PATCH 097/168] [confighttp] Add support for cookies (#10176) #### Description Add support for cookies in HTTP clients with `cookies::enabled`. #### Link to tracking issue Fixes #10175 #### Testing Unit test #### Documentation Added to README --- .chloggen/cookie_support.yaml | 25 +++++++++++++++++++++++++ config/confighttp/README.md | 4 ++++ config/confighttp/confighttp.go | 19 +++++++++++++++++++ config/confighttp/confighttp_test.go | 1 + 4 files changed, 49 insertions(+) create mode 100644 .chloggen/cookie_support.yaml diff --git a/.chloggen/cookie_support.yaml b/.chloggen/cookie_support.yaml new file mode 100644 index 00000000000..d360efa6177 --- /dev/null +++ b/.chloggen/cookie_support.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confighttp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add support for cookies in HTTP clients with `cookies::enabled`. + +# One or more tracking issues or pull requests related to the change +issues: [10175] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: The method `confighttp.ToClient` will return a client with a `cookiejar.Jar` which will reuse cookies from server responses in subsequent requests. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/config/confighttp/README.md b/config/confighttp/README.md index 49893a0fd63..2a6b0e7fd64 100644 --- a/config/confighttp/README.md +++ b/config/confighttp/README.md @@ -34,6 +34,8 @@ README](../configtls/README.md). - [`disable_keep_alives`](https://golang.org/pkg/net/http/#Transport) - [`http2_read_idle_timeout`](https://pkg.go.dev/golang.org/x/net/http2#Transport) - [`http2_ping_timeout`](https://pkg.go.dev/golang.org/x/net/http2#Transport) +- [`cookies`](https://pkg.go.dev/net/http#CookieJar) + - [`enabled`] if enabled, the client will store cookies from server responses and reuse them in subsequent requests. Example: @@ -51,6 +53,8 @@ exporter: test1: "value1" "test 2": "value 2" compression: zstd + cookies: + enabled: true ``` ## Server Configuration diff --git a/config/confighttp/confighttp.go b/config/confighttp/confighttp.go index 889eb08c649..fa6ff795331 100644 --- a/config/confighttp/confighttp.go +++ b/config/confighttp/confighttp.go @@ -11,6 +11,7 @@ import ( "io" "net" "net/http" + "net/http/cookiejar" "net/url" "time" @@ -18,6 +19,7 @@ import ( "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "go.opentelemetry.io/otel" "golang.org/x/net/http2" + "golang.org/x/net/publicsuffix" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configauth" @@ -104,6 +106,14 @@ type ClientConfig struct { // HTTP2PingTimeout if there's no response to the ping within the configured value, the connection will be closed. // If not set or set to 0, it defaults to 15s. HTTP2PingTimeout time.Duration `mapstructure:"http2_ping_timeout"` + // Cookies configures the cookie management of the HTTP client. + Cookies *CookiesConfig `mapstructure:"cookies"` +} + +// CookiesConfig defines the configuration of the HTTP client regarding cookies served by the server. +type CookiesConfig struct { + // Enabled if true, cookies from HTTP responses will be reused in further HTTP requests with the same server. + Enabled bool `mapstructure:"enabled"` } // NewDefaultClientConfig returns ClientConfig type object with @@ -232,9 +242,18 @@ func (hcs *ClientConfig) ToClient(ctx context.Context, host component.Host, sett } } + var jar http.CookieJar + if hcs.Cookies != nil && hcs.Cookies.Enabled { + jar, err = cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List}) + if err != nil { + return nil, err + } + } + return &http.Client{ Transport: clientTransport, Timeout: hcs.Timeout, + Jar: jar, }, nil } diff --git a/config/confighttp/confighttp_test.go b/config/confighttp/confighttp_test.go index c7c45924783..dfce5e97c68 100644 --- a/config/confighttp/confighttp_test.go +++ b/config/confighttp/confighttp_test.go @@ -83,6 +83,7 @@ func TestAllHTTPClientSettings(t *testing.T) { IdleConnTimeout: &idleConnTimeout, Compression: "", DisableKeepAlives: true, + Cookies: &CookiesConfig{Enabled: true}, HTTP2ReadIdleTimeout: idleConnTimeout, HTTP2PingTimeout: http2PingTimeout, }, From e60ea2a2903ea094b797163d16f33a01fa60aaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Thu, 20 Jun 2024 18:22:59 +0200 Subject: [PATCH 098/168] [chore] Document how component developers can add metrics to their code (#10443) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #4198 Signed-off-by: Juraci Paixão Kröhling --- CONTRIBUTING.md | 84 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85528d9a6c3..8ff893ef042 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -379,12 +379,88 @@ The following limitations are recommended: ### Observability -Out of the box, your users should be able to observe the state of your component. -See [observability.md](docs/observability.md) for more details. +Out of the box, your users should be able to observe the state of your +component. See [observability.md](docs/observability.md) for more details. When using the regular helpers, you should have some metrics added around key -events automatically. For instance, exporters should have `otelcol_exporter_sent_spans` -tracked without your exporter doing anything. +events automatically. For instance, exporters should have +`otelcol_exporter_sent_spans` tracked without your exporter doing anything. + +Custom metrics can be defined as part of the `metadata.yaml` for your component. +The authoritative source of information for this is [the +schema](https://github.com/open-telemetry/opentelemetry-collector/blob/main/cmd/mdatagen/metadata-schema.yaml), +but here are a few examples for reference, adapted from the tail sampling +processor: + +```yaml +telemetry: + metrics: + # example of a histogram + processor.tailsampling.samplingdecision.latency: + description: Latency (in microseconds) of a given sampling policy. + unit: µs # from https://ucum.org/ucum + enabled: true + histogram: + value_type: int + # bucket boundaries can be overridden + bucket_boundaries: [1, 2, 5, 10, 25, 50, 75, 100, 150, 200, 300, 400, 500, 750, 1000, 2000, 3000, 4000, 5000, 10000, 20000, 30000, 50000] + + # example of a counter + processor.tailsampling.policyevaluation.errors: + description: Count of sampling policy evaluation errors. + unit: "{errors}" + enabled: true + sum: + value_type: int + monotonic: true + + # example of a gauge + processor.tailsampling.tracesonmemory: + description: Tracks the number of traces current on memory. + unit: "{traces}" + enabled: true + gauge: + value_type: int +``` + +Running `go generate ./...` at the root of your component should generate the +following files: + +- `documentation.md`, with the metrics and their descriptions +- `internal/metadata/generated_telemetry.go`, with code that defines the metric + using the OTel API +- `internal/metadata/generated_telemetry_test.go`, with sanity tests for the + generated code + +On your component's code, you can use the metric by initializing the telemetry +builder and storing it on a component's field: + +```go +type tailSamplingSpanProcessor struct { + ctx context.Context + + telemetry *metadata.TelemetryBuilder +} + +func newTracesProcessor(ctx context.Context, settings component.TelemetrySettings, nextConsumer consumer.Traces, cfg Config, opts ...Option) (processor.Traces, error) { + telemetry, err := metadata.NewTelemetryBuilder(settings) + if err != nil { + return nil, err + } + + tsp := &tailSamplingSpanProcessor{ + ctx: ctx, + telemetry: telemetry, + } +} +``` + +To record the measurement, you can then call the metric stored in the telemetry +builder: + +```go +tsp.telemetry.ProcessorTailsamplingSamplingdecisionLatency.Record(ctx, ...) +``` ### Resource Usage From 3ffb41e49de6ce0d03f87014821e1128f369cfc4 Mon Sep 17 00:00:00 2001 From: Matthew Wear Date: Thu, 20 Jun 2024 11:55:21 -0700 Subject: [PATCH 099/168] [component] Status Reporting Documentation (#10422) This PR adds documentation for the collector status reporting system. It describes the current state of the system and has a section for best practices that we intend to evolve as we develop them. The intended audience is future users of the system and anyone interested in getting a deeper look into how the system works without having to read all of the code. This is intended to be complementary to the [in-progress RFC](https://github.com/open-telemetry/opentelemetry-collector/pull/10413). [Here is a preview](https://github.com/open-telemetry/opentelemetry-collector/blob/61abf91b4faec42905b409c352e0e234e5b75ac9/docs/component-status.md) with the diagrams properly rendered. --------- Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- component/telemetry.go | 3 +- docs/component-status.md | 86 ++++++++++++++++++ .../img/component-status-event-generation.png | Bin 0 -> 168686 bytes docs/img/component-status-runtime-states.png | Bin 0 -> 47170 bytes docs/img/component-status-state-diagram.png | Bin 0 -> 83660 bytes 5 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 docs/component-status.md create mode 100644 docs/img/component-status-event-generation.png create mode 100644 docs/img/component-status-runtime-states.png create mode 100644 docs/img/component-status-state-diagram.png diff --git a/component/telemetry.go b/component/telemetry.go index 29f9a21698a..6f8f0ec84d3 100644 --- a/component/telemetry.go +++ b/component/telemetry.go @@ -37,6 +37,7 @@ type TelemetrySettings struct { // ReportStatus allows a component to report runtime changes in status. The service // will automatically report status for a component during startup and shutdown. Components can - // use this method to report status after start and before shutdown. + // use this method to report status after start and before shutdown. For more details about + // component status reporting see: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-status.md ReportStatus func(*StatusEvent) } diff --git a/docs/component-status.md b/docs/component-status.md new file mode 100644 index 00000000000..bcc1a73f013 --- /dev/null +++ b/docs/component-status.md @@ -0,0 +1,86 @@ +# Component Status Reporting + +Component status reporting is a collector feature that allows components to report their status (aka health) via status events to extensions. In order for an extension receive these events it must implement the [StatusWatcher interface](https://github.com/open-telemetry/opentelemetry-collector/blob/f05f556780632d12ef7dbf0656534d771210aa1f/extension/extension.go#L54-L63). + +### Status Definitions + +The system defines six statuses, listed in the table below: + +| Status | Meaning | +| ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | +| Starting | The component is starting. | +| OK | The component is running without issue. | +| RecoverableError | The component has experienced a transient error and may recover. | +| PermanentError | The component has detected a condition at runtime that will need human intervention to fix. The collector will continue to run in a degraded mode. | +| FatalError | A component has experienced a fatal error and the collecctor will shutdown. | +| Stopping | The component is in the process of shutting down. | +| Stopped | The component has completed shutdown. | + +Statuses can be categorized into two groups: lifecycle and runtime. + +**Lifecycle Statuses** +- Starting +- Stopping +- Stopped + +**Runtime Statuses** +- OK +- RecoverableError +- PermanentError +- FatalError + +### Transitioning Between Statuses + +There is a finite state machine underlying the status reporting API that governs the allowable state transitions. See the state diagram below: + + +![State Diagram](img/component-status-state-diagram.png) + +The finite state machine ensures that components progress through the lifecycle properly and it manages transitions through runtime states so that components do not need to track their state internally. Only changes in status result in new events being generated; repeat reports of the same status are ignored. PermanentError and FatalError are permanent runtime states. A component in these states cannot make any further state transitions. + +![Status Event Generation](img/component-status-event-generation.png) + +### Automation + +The collector's service implementation is responsible for starting and stopping components. Since it knows when these events occur and their outcomes, it can automate status reporting of lifecycle events for components. + +**Start** + +The collector will report a Starting event when starting a component. If an error is returned from Start, the collector will report a PermanentError event. If start returns without an error and the component hasn't reported status itself, the collector will report an OK event. + +**Shutdown** + +The collector will report a Stopping event when shutting down a component. If Shutdown returns an error, the collector will report a PermanentError event. If Shutdown completes without an error, the collector will report a Stopped event. + +### Best Practices + +**Start** + +Under most circumstances, a component does not need to report explicit status during component.Start. An exception to this rule is components that start async work (e.g. spawn a go routine). This is because async work may or may not complete before start returns and timing can vary between executions. A component can halt startup by returning an error from start. If start returns an error, automated status reporting will report a PermanentError on behalf of the component. If start returns without an error automated status reporting will report OK, so long has the component hasn't already reported for itself. + +**Runtime** + +![Runtime State Diagram](img/component-status-runtime-states.png) +During runtime a component should not have to keep track of its state. A component should report status as operations succeed or fail and the finite state machine will handle the rest. Changes in status will result in new status events being emitted. Repeat reports of the same status will no-op. Similarly, attempts to make an invalid state transition, such as PermanentError to OK, will have no effect. + +We intend to define guidelines to help component authors distinguish between recoverable and permanent errors on a per-component type basis and we'll update this document as we make decisions. See [this issue](https://github.com/open-telemetry/opentelemetry-collector/issues/9957) for current thoughts and discussions. + +**Shutdown** + +A component should never have to report explicit status during shutdown. Automated status reporting should handle all cases. To recap, the collector will report Stopping before Shutdown is called. If a component returns an error from shutdown the collector will report a PermanentError and it will report Stopped if Shutdown returns without an error. + +### Implementation Details + +There are a couple of implementation details that are worth discussing for those who work on or wish to understand the collector internals. + +**component.TelemetrySettings** + +The API for components to report status is the ReportStatus method on the component.TelemetrySettings instance that is part of the CreateSettings passed to a component's factory during creation. It takes a single argument, a status event. The StatusWatcher interface takes both a component instance ID and a status event. The ReportStatus function is customized for each component and passes along the instance ID with each event. A component doesn't know its instance ID, but its ReportStatus method does. + +**servicetelemetry.TelemetrySettings** + +The service gets a slightly different TelemetrySettings object, a servicetelemetry.TelemetrySettings, which references the ReportStatus method on a status.Reporter. Unlike the ReportStatus method on component.TelemetrySettings, this version takes two arguments, a component instance ID and a status event. The service uses this function to report status on behalf of the components it manages. This is what the collector uses for the automated status reporting of lifecycle events. + +**sharedcomponent** + +The collector has the concept of a shared component. A shared component is represented as a single component to the collector, but represents multiple logical components elsewhere. The most common usage of this is the OTLP receiver, where a single shared component represents a logical instance for each signal: traces, metrics, and logs (although this can vary based on configuration). When a shared component reports status it must report an event for each of the logical instances it represents. In the current implementation, shared component reports status for all its logical instances during [Start](https://github.com/open-telemetry/opentelemetry-collector/blob/31ac3336d956d93abede6db76453730613e1f076/internal/sharedcomponent/sharedcomponent.go#L89-L98) and [Shutdown](https://github.com/open-telemetry/opentelemetry-collector/blob/31ac3336d956d93abede6db76453730613e1f076/internal/sharedcomponent/sharedcomponent.go#L105-L117). It also [modifies the ReportStatus method](https://github.com/open-telemetry/opentelemetry-collector/blob/31ac3336d956d93abede6db76453730613e1f076/internal/sharedcomponent/sharedcomponent.go#L34-L44) on component.TelemetrySettings to report status for each logical instance when called. diff --git a/docs/img/component-status-event-generation.png b/docs/img/component-status-event-generation.png new file mode 100644 index 0000000000000000000000000000000000000000..aa604e26d8e5db5f0cf0239f2ff8ff1ea4c6b1bd GIT binary patch literal 168686 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 E0AF_>w*UYD literal 0 HcmV?d00001 diff --git a/docs/img/component-status-runtime-states.png b/docs/img/component-status-runtime-states.png new file mode 100644 index 0000000000000000000000000000000000000000..d0c2296554f476504fd4670e9790487d761e9d4a GIT binary patch literal 47170 zcmeFY1zQ|T(*O#D1PgA#-DPoicbCP32X}XZ1P?(LcXxLSE&+l&1Qvq3``w&Z&Ux?s z3HO_4hUu;8>gulQF1kx1RFtHV5%CeBprDXtWhB&~pkU^qprE_p-$5YFM&h(7Amx7iPzW3vqsXoH@2EQlnk$+N=uGvnQO1`c#VeUuDryfc8nMjuwSTM8xaQPfd$oHe`GsP0~|uiX(7! zWs1Lai#{HCPv%WxTd)`cH!K3lV(%vUeau)46(4N}Z;SlmS=03sIN?9~+(swJLEC4o zjX{IhrY$xCTl@=Ra%j+8)Asc`S24f?oj&;eqe8|PVO@{p=;vtp+}^z+H*!~^AMjDR z=Nt^SCr6VtP4aJ@-u{kHUOggA=Lu7p#Gpxu{-#o^Pp=Jg{|-gp)3&N#_}dhwWkVaP)t7l`36fK`e|z8y=D7i!5b{v$bsLEEdoLt zlD`g?d&k%M>I*?0X4HAuuiIhJ(yG$!{9WIe9Z+lk3?ksNe_AOT*L&%5Te%_PFLys)ulLw^Id}ty z>UVw39Ue#ceA8|^r0g4TF}u%hIr$6@Cz&*A@!Y>iDi?mf^d6t&wsu%=^V_vw>pooz zILi)?BNnz|^XG?hfP(^vkrojLQ3OGEhmzige&7hIxx<4;#yUcK!3wqEc$e1O4IlP+ zb$19oi&;|)6%(igL)O=m^%fb8ke0{9ar;*alCmmC&8NUAk}^1gpu?ymrKeS7X!%q66Je`*(Q^Hf&p|2|U?I-}ON zDUM_50tNh1@`&pW|IsA1R1LBj+8w!_C{KWMEZ71Ow&>vv9sS213Wmz-AhRG*9}z>@pD0sx(rD zLfgF+YKCFNO^)RhB(x{B#cfYlW0yoy6o0qWs4F0c)Dyb6anG9Re8B7cBcNL4qYDg6 zL`555_s!?(H*W7f&NF?KWvc5$gqG^3=2XDjKK zAdOkXb{9&XlrhO!FLVhcjhe)>Uk^FRe9RG|Q))u)xbMiEt;m)1-M*8l!nX;?iZ2~j zjmJ!vf>dJfy9M5VSV4i$L}2tplKJ@+JVTdw3N6Pjb5dx*VBnS z`>r8SVN~jl1#xJhK_WQj^BY{cA3x4Rx6yGk2W!!4Y2oSM?pnmM&Xs7HJ6IDBM`I-B0%-Vf(~)IX0p`KbEJ6=RCx| zdUL*)J`|g()Cf*5=kyfN3GG!t=K1ECfjek?M9}#&4F3z*@}bwV7Ml2ZUG%YxtY(ck z%rJk(?F0D0c#bJ#kpV^w#icjJzJ z0RJ`pSnG@Xfo8JIdj*8cEo5^8M2~zpoK)$9 zM0LeNm71TmvF=!E{?PQ23K?0LBC-j(GWoRaz=p*J9>TV>!JP|F0U-lF7j$^os;Vlc zJ^F(7_V92TgRp#?_{tC=A@X>DdXy>sH_;pn#*w~>^=QAYJ>Q#mJB zGW)$6S5pfuccqiFjwhJ<0bQU5oAXu5bS-#LIfcXg;0o_FKt;%BV)Y&y35Qv?!)*To z8=_wI+U=jiV$z#!*P80BC)W=?8~OQd@7027lrsfy!T0i@fHtkm%W*xA!xLf8ySoUN zr|O%#(lGRVD?7BaDF1aVSg_oHzd| zLw7;GL5Zr1%gRFD>ZZ=-=Jqb199#vB(iR~A1Vo$0hx`&G|K#fG$Oiy;cz7^-uroV2 zTLM^ld3gaWYydVkCP)n?7cYBPV^1b~7m9y1@}G7j%w0^KtsGsg9PCN|v}LkZ0BbOebxG1-4#TU*P-VN#*R zLQGU!?oPy!?-kxy9XEIJ5HU+wUGG{kv~b^ENwvI5_SlsYFpT`{7zhRb&%6IiAY6!B z^c@-d|A1v+(B@mvMWA5+zD3|5Fg}qG1T-kOpWgmrNLgZO`}`#;wG->m!p-+~R2LBG4*2-rUd4`JcpNRg3|Vd3LjKc2Pv zwIHf*9_XiQ-}A=Q4f$K{0*tySU(SqAn^6-Yj;3oB?f6hpQQ`P?AL*Hj)x(R6X-Zw( zGyQlf5w-m%il69}TG_;&HeHm8t8%v*tL7)lk4mqqqqN-{7N#FGbrP8#uWqaw_caNP zjP8@lkLa`sCj2!m>{{f?_3bja;y@r!OuO7zRb8pRUCKNFGg5e&rP63%sNc;!pjHsO z>bjg|=i>QsYXHgnu(H`i4R$-m9HRSc-+%Zm3K3!t5&RQmREZ4Q%pN6?n+G}lM7a78 zI`sJyIw5r3k?JSqy_y~D+7W!Q;3wZI3FQU${4EP5CkO&#-zUKMnlK!yna0P8pHff(S=t zj*x*)p5N>@7_YCdvt?EH?Q7_|^G@jKVi#>Cm5=B5E^2aVro_d?HH_`jN84>dLD!>s z-kp(Q(`$TLZnly2y4c3p_mk_5*x8fp7!^2E zbUrH(j^*&Un{^|g@TlN>A8Z&Vq`5>G633M-SAYyIF6Rrtqs|(7ik~!}DzEYq3Sa6S zsMo_}p3wzogz|^bt>F9Ee$IY8SaNXT72tTR@AF5n^$H8q6u1>AqDp6uM;k__tac3PI`oxIJe7hex2kBbD|(!TOr zDxQ*UEl%Fn7l-d;-I#P=Z-_bU;8x*=kDMX}C^POp5pAAgw+kITEM`WXm9m4TPP<=a zi(~CcQ8(f;urZC#6?zuCQTM0HOJZ@KN4fZo6Fj=G z00IKf!=Ilvc`7$9LTkP-D-HEV3y)4#VR*H9^rMrUXdRK=*H zBHI}>7(?njlr;EO5jW6JtZSZM1dXGLuJp0y87)m0)!$ws!4}W7jb?ebsyGqalML?C z8{W@x8sb(p7CuFaY8cGfk0u?D9#5cZ+dTSsUHIh?=WL4gCnuAXu*Fd+34I*s#3r7+ z(Z~qzI5qQ*4?pE~Bl7=x*~%4rS;`W-%j1?^=8E3O$hAl<{8KZ-nW>41{lR<<~)W4;-3+Im?P{uR?TJU z?HYqBy=gv?^_G*wrZ>8*_~)9Mm%k65La)ac<~vCBI#8h9xfmVh-Gg}ELW8J#1lf0) zv-2ggBJ|rbXfym_?N?hwcg8^BHS?%+j6oua2(S%0GTH$zpOucDmEdiq~~ca+pPFM>8$Wrm|Qf z*B~`h)!YI@TcpzT)Og@sZ4e(FPg3WX6KRssVzdj;ER$dR)NL+x>wweeM(vmIUVRi4 z1v9Yn{L7c{04jYLJsn%zZ^rYqb}%TBj=&@9i&CKCS0ZeAM8%HLJU2V9^{-0lG|T=g zb{HcB16FJ+YZi2a<aqd8U;<{r5k*Jfkyix5F}*;C^+QS0mk9Us1y4UzMTq7P=)~0hVkj{8m7(ZQkk#K2iA+~RZM$@r3e*T9Kj~*QwozF zm-R-MU?YmPqBIH7d^k)6WDhNo)|2DCF`Y22Q^~{NU zqMmB)pSrS`B)Tu!lLL$2pew@dfMDEdQ-U^cgx`R3Vqhzdc*te9tTLv=w0{LoI9cN> zA%brq4T5g$&i%Rz_;kB2n7GJZim@7}HVfgs=z;jpq3V z`Zf7-fBv|8Z@9`Kw5IAIZ1zhmDohy0e21aye1%S_`B*a6BGuQ4=UZ`KmOf6=o>|xj ztyAR=`r+72emaDZMyr$1xpM89K!@8^1wcqIH?$X)k~rA{fC6?t+)8h zh%gq^KfzIki5y-S%QapURF?`C7Fb1Pj~To!pL#vOw0nmbSSsB)r3bO2ZOlP{1Epeu zZh->2d>i$pZ>a{&km3Dkq92~{-@aBd$gJp%&Vq%^+{1-xWyMF%+?7fDzlUUVe{!WX z>hWp3jWcnT!Hd$FG=d*3h0l$CJdHPIxsg^%kpRm%oIV$YS?bsR46Yib<#-1DG*!8Z z3;h~~IE9qIdQzERJp1&0behU>ho`SL30cJ0`gfQ$h&eLLM~XZ$LXBP50@36#FW6lD`Tlkw}LFA5Fj=iv!3~u7p8Ujgpcy*+i_h zytt_jn7Su9jl6DVPl!Y1;*1oWX02Z>Iz(Ld*`vW1EW!8Fq?0a)rZX07*Z^r9GTa(f z7U_gjxt?D*xH@wq*}TfIisiLXeUvdC7o2zVUMLb4Cmv*C(np3B2@IBV%j4J=E}$9% z{cK-94VGayyALNay&SlgfdfG1HnIg*s0!yT;~Tdqa_~rld(!FSZAXihA8j3_JM>WfQ`l zo}NnFkC)Gx>!f1|Wy`gg^DSQPOEuNO@Q27N6Y6n61R3ka5d)N~d~+AWZmsN=3Y#3r zFyJr|85!CgS}rj|MtZ?{N&490?w4Bw%ky2Z(rWl@}(?Hk_WyYC#XqsMZIW}UF~dj=_+Uv zuGTG;cB#|t5a$?c?6p#-KCDW=RjkwdIKd9E@myi9XK6v5YTJ%t$I zit6lkL%BpH)MSu}^_8!yfeXro~n|GDlPiI??9P6Xf zs?;^doYDX4dw-#-qJoCaWSv1gHw?AfWJhqGyd`HwBcB{Snn)+kScinmOi0st$yfnm z(o+bE=~wv*WqKy)a)a~s9TTVz$@9H^{8P4CS>njvRDSW*B_QDEgrBz6TJmMxkb0x| z2_eaJ0eU0t037gKiZucWv|zzZLrs2B>m&=|ypVG@sTm!I#%~?gV!EBtm)xuN%j}%> z^8KFp!>eciDbr_rQ?d$H%bvOA6_s9HJ2drXe*^lB&WiF{2``ZzEZCMIKARv$4!3y@ zxgE^=rAP1YI$gfJ$IFdTo>6u}->4PoB`tO*GWWr8YXL-hCnM{%rf@|3?$Jt_e3Ee_ z!pRA3V@V7&lJ2(G7IAp&Qt*e8VnE!2o)*0qjs*ekAqup-jpx+@H zM=X@LqU~R(r)@veNpMT+);6114@4Q&W+tIhx;cQ``OJ^{X=C)wl~UxkMwKXUcv)yz z*wpff&Hh;!g+`&IdHlQMQz*Jvm}Tr^5gkOcB0BbB73&QSCudD!mmi0;^(imA*#X;} zUR{z2)QTl)g>p{QrUW$DF@ut^guG%a%?{1i7WENN_m}GT7dt!B)ga`tGE$@xO>ppR zFKMs$(E8YH?Si#zW7lHXbGo5X$2S(FBj)FM^xaLcrr1-`yDgrr?$@lTDRpi-qpG+) zyL0l7SEi@m%V&#L^~OWYEAXFF6khjHnN)vbL*^}euiUjt<1wK8)jh5X{W zDpCZ4J;5XA0*nQd&FN+lULGUj{~j>(Tz-J_d^YiZ67esB2BLc>p3hgh!0ka8a{}>w2GGv&xd+E@;m*;ZM&E` zogNG?O;8`n!|NZVe^B`N+xdp5PWDCD(bdN?+?fx_lUxh!UcZ8}cWBBkb3fC=@HrTL z$(ye|mLc>SJ(|m|U1S&Kn%rTXbdWuQ0UOmE9ris{g_iz`ZS>`tFo(%2ejTReuejUPxMU_31M{)*s->7bYS{gnD?D>@=^p1bk{ zw~6H7J1(t3TZ2B{XP;sxiCCy8TVl4}K8q^DPI~s*;opY-#OXwHn(EXFDI$;~buO18 zl6rmEAliI!SGQ!0E+EnEbheFSt>gLYyqyqW(u>h;gnU23NAT7ED&&Tw%bozS7eQ;n zPKvi)@=5adIk=d^^4uwnZ})4%_kfF?moLj40P5s3c?Tr*tnQbGxG=xw1TI9f0u-EH zf%QjlLu_aHZ9ss;*n+?Ekn*coKx7j0dH^@V&TyJ;mF_oIzy63`YtHvgJ{At#av3~9 zZ6V|4qDFb661;;Q67iFt<~=qKiKPpfas4}_q3v*F`MJPasNI3CcG_VW5!hM{a8c_k z9xu|bky+Qx2{g%WvdKqt0J51~;=I$M)8hBpej@3~VXp)^jaH|x;7wC{L$BcXFQU=B zN+~~`rmZv%tQ%GNk&KV8-I*@VyvMMktPa@lGCS&OqB!A^*a*Ge-G> z{uC>ulrx!P!HKTA!apu9*ixM2Q=Cr^1BML=V$Re0pwsQ&NtjScEzISxE-)?libWZSwnnTHVs7VS;0_g7(;S?&IQ6+qZG9E})NY-t zU9|iyIyIlQ9V15P;C<*Pt)X!})KbZzLgyHB>>_>QzD~P=g{`ips~TsAgH@^_tJPUQ z`iRfzG}5~G!VP?dO6EFJb-A=-`}NJ{ZJL)7{D{!@0Y3~q6Q!cot%al__%tgM)gSWJ zKmjjaa)n)K+Zr13rdz1hs6u|W1`pf$9uYn-mJ`DCLehj6KM0MKZ=B10b(>cL-5RVO zB}c!pQdMGtS14Q@0p5~__&cDuTeo41ByT=5_o+Zpisq?Nc;Ucw0d6khgDm&xR%d-=4 z`~?ev=a<7bc(bk_G3m7$ORln){KAT^Q^=lU9=RHJjPBR0munrv*+hwG+`obw?V!*4 zk%CaDLTe_{BLN?sNqu0e)|4y=6b_wGg5up|C*lHsz0!7`gP@5TBG@1|KS;R ztlG`C+j}R&RSf>oMp!Q^Xql;{oEx!dOn5CWupv$6^bjm5t+ZMb;exYW-&GEfyh7a# zD0~RIG$*cPG7s@7_ew%G1gC;9^jV7$yu7{DG!E-N?a<+~S+sMEb*>vMC&r7V9X6To zQk@5PDi3PXCP>;&tHpRDuS=wR=xYp+R`K6Xlt1{b6xRXySDj?!#simJ_eUMrNM6$% zPn)~#o?6zuB!I`(t);djKe$#v)$7FvF`suhCyoy7kt~%p4)Mt9k+L227!6#)n2C*z z4HV&R-bc7L{)R~Qw^K5ed@|+h{LA)2T|;>-hk+NhM;1A?N=CwU)d!UzYqt_v;;iZ{ z$BV;8evXp$kEufYE3#HsH>%sm$C7aKgax7ExFctVEYAix-EHRHv)&*@Yo zHp5RG$Q4|U8XB%I-lEr@Y(If8|13wXzr ziYKDO*6F=JJZQp$aO-|KrTCNK@j} zmE4I$fTsIE-Rz;uU{oFK{dQnFK)K|j*Vx0jZKCA%>{R2v3oBhbs(oMPW7SXYyy9N%Idp(boHjohDAr)n!f?GU?HiTiigHsPkdN$2CMXvsSuXYc-v8i)PbX2qH+ z)~R3MDNIMSNQgzI{cnlCC+JSVspOFb#YQrXCj`)Gtwixi42MS9r{zJ^@aw~2wR1&b zK>Ne?LPxX}{s=b1gUFS@ZK*}7SxUPZv$b%SK|y5e$6+zPmU%WIr`crmzfQsGH7R#I z>;Ee@M8U2!f)zccpFPLU= zJ7nooGrJwkYUE2H^SbL+Covdme!!_0xKDjsh0!K=Boy!>5d3S$1$z(%G*eHjWvnX< zfF5mXbfV9y#x;@-hD9(tEog3TUaiw>?eOD%yw3+ZKDQ7P4v9N?8rWJ6CDN&X8jQA@ zWf-2^r{uBp+TxG)QEHFe8M%XhXiNNnWT5|$E#xQq9PSXoa^n?=R=>QilB)8w5M?gFvQ z(O-^kzH$XufZlW_|gwrNkiDNS@SppWn~We$cm- zy_pQ{U1^=eIpm|@O~1Dc&R4$D^^+7jjaZ9pqFq~1$# zS0z}v`bf!{q$kiC;Z5ASp`2FjGD_5DwYS-OPVVkCH3n?;wHYFw5aR;td$TNsBBF&O z#%x6Otwyz_imSDnG&tzMHflzT%h0_T&^o0zM}X zG}>0Qnu?T#{U>pXu;=-;n+xNPs68eOe4~LH7p%TLAdP%Ed*jQtMW|1BevHXWD`d$l z>e3pAr5AYLcd!jD0DMv%l(`Ff*r7E_rXeQjWzmph-9ohysD6pS-A1PHnP})dt!!tj zwT@w^I*%yIT?%bDo=)vm_sxEDdbjGJ0A9(E?N~~SQ{~W1TplPb?pD29I^av~itiaU zB@vBB^jTms`W(Bt@jyiwICyo`prcftH5g%wCuRG1thgFjVUDl%tu))b^~#25hhXQV z4^#;#d#drHSYtAm$yqsXq^oD1H(t@lZaS5BP0NgJ+u1E!<`MdZ+a@PG^7!5#74?I^dL7$!TPN%Q&2XkVgGVC^ zuWyzI*&Xz!<&Hjn!lOsaY;&CS&r(Z%xE#Z(wzw$E5B@OeCx4W+m}@R;jSCc`24BQv z)aXTv3-5oe)R?;BkgQRK(N{Fw4w<0lbth?Azd`zpF>ifrDnNy) zUe?|P{nPh-xSvdhWZ6)wpT2ia`MOrmCcNDK3Ye~bDR|((zD}D-_y)8bFL!J?R}LKd zBgHJKaYD&d42xKepjm2a8s)48rsrg8Mf_G%QdGg=WF~@v`PiU%`kZts=cad_3f!}s z$legyFolt6SaMNS4YNG-JL2$0%(G|kAPOeK6$%}_9Z`fTb5bJ1yng0 zkEkkvx1Dwf;)cnNb)Hsxs{xhz0qMwCfG0dfG{LKZPdx{!Z->^GY=ORn>-d!6^Ag2bqgCjuPU^R#*xH`hSk-3!CSb{37xHKo zTo0!F+>q-y;TM_JnLGpDUIT)`xkERT_78~DLu^=Pzv^BRxxj}TX*xV{wp?;IQkNF2 zecb-?BkNxB3e$-B^KVypG;S~1venBsgV5*O-DN@oJ;{1{AL=u*r-pSX=;ZS%RGHsI zb>&OPjV95}Ca>Ctgf?YolbmBX)(ZaS8x7@>c}INky}Y92c)fLTYCqFm%fPVJ{O-({ z!@^OsY!CO^-NS;tsjs0Ev^)|zQ8iZni34{Gd@do#iKo<_L2z56M4}B)%Y+vwYVis$ zY%+9o>&y$CR@Gv)4FL^~(Fs`>ix|>{ggbQXfBbIU&5Mc}WX<5txEiqC#>B6D0+#h( zrr>j%ip5>HL9{uh?>-RJ+SP5g9Z}#=V#H1n=>VRYjYHM4Md?z77zx}_kvg0-^rvT+ zxD7VmH~QN-+*}g`s3bikV;8==tzsN{kuJ{CeXKem5w;^4Pw_}$>}`uio6m0Zj#tzc z5=S_McnU@h7Si6s=WNX})(0ytm@umuuXp(Zd*F5OalYG0`8|(fi~8T6q0K?$@2(0Jq@jBvgfX&~<|23A(l<)8kr2wJNMrBDY{;{wZTcv5gO{_|T z)n3M}O#kIt@OV{xMJ#%0NBr8p{Jf2DUajKYbg3I1?^MEMBOL0&-F0jsD9wXn+pR)c zdD&EtNFrV9-iv%YY#`|B`{T%$fxBog>1|K@W1#&>V|xE_x+cr zOQU;?{QgFK_6Y!jx+O`njkgV+Be9`>jX9Xy`3;_scDU}O9)C1-*|nLT_c3YdD7GFm zz=6l_#F%$*nO}$QLguSb6Z6~lsXx9Qzn3Sk)<}`d@8cz37QdrPKcWAst=pI-VszK) zU_ko5mG<^h?=(#KF8k#+v1xooG~Lpn3A@47u9jE9Az6QsZRq5JFEqE(|A z87?Omh-o|P3}V-wX<%(EP5fYEoA^0fQ$PzC6XdVn$}9N#ttf=FTJu@+vrdz3$F#IK zD+)i@@^p-KLiqV9JR_x;sLXM*X3>6`&nr%n&OyWFX3Kze=}dbC4c*)kl;T?KUBw$c zu=82?C8qIa2RLsI(}F0MJmhau#1!w7Mw%3qnhQ~NIWb}JaQ>Kq?tnRSL959vrF zyP#l2+hHb@0#~!fwY<4fDk(i;Cy2ww;8d?Q4kr$1Ef3-~vUs389C9`(K$P%dz^K}+ zt5HfPV~Ww?Npq%*?Uc0@*tdt+4I3c-@76SURP0T|#pOnubZ;6dL*vkJbNyBmJeSe* z16Wwt{)f6y0&e?)Dueb&WVr*?S}|2Uiz&{N)jd#f^OgOIU8r5(w*{T8tTkTD=N;$p ziRtq*M4T9pe(z;3mm)XdbFU7uVBb|mRMyV)N^<+W%hr!KdD^czi(a+3RGxZAVi}}S z>w6yoVSfyJlNr3?Zin-Q)zS@lPdhQSqN49thIZ;N-FMX6lzi-Xz3@7FjG1T++=s>` z8f<{L_jT}`B(oaJy6jd=cA3rN7TiAZN3-s>1Q&|Gd@tgd$OLMY0z=)bSzBF?zSSl& z$gVQB50d-b94$E?u~gIdw!gh#L4Qfvtl7x@cKBlq`@%8R`}$x20fxAHEms^ajk_=i zc)T^k(^|w}5b~Dw)RWtYacYR5@e}I$QjNr>t46~|K3=Vq1z3-rzRZIQzKIi{@|>w( zR;b%W-gYX>@4j=xAv7n|Kal`_4_8+AaWd&sm2}k`yQ8N|a;?fw=h1_SfXN~66pjjH9NX@Qof{0Qt0E4Q_YL?r#{Gz`>IQ~G8wLlZ zgFqvJ<#gX~IFyqTwYTM)ho0mobAMT4OPK=#0<5{4n0C-jki&h@T5kF{Yl+=q!WAvD zg#DDp2CH&Dn~b>-lTX`O;NF(he7Bj(4FS%}Rd5R#Uwb6dSUq+Aat1Kpnp{5o=%DiW z{Ug;J)gEHxUo+7}KZ*D~0gE#ukXkPpg_B4T-etO+@613f;Q1Az94z$2dFj34abQJ6 zNMOLlk(#2v^{4^fR3i)_Zp41?`y%cC^bg`!Q9>r*DnQw2#ErTEGbuK=LxqWuB0{#W zG_Rz*it8*9Lb#~z+B~zP0zv}~$t3K*Ygfy6xr>i<)NJy9 z!9ju#C}2zn-ig%rzhmuK&9dBD6$7>pvh&22IeZ!WAP2ns+$oy?b-+_gu|xatV4m<^ zlq3`u`VGcM$LEf(31|zv}iqm)o0&Q35$2iI8s!#KkU_Ne!pk)cc{v;U*pT zI*tTJV35ygT7tuT1&jV`#m6Ts80{Dr7#gLFoOj6hKZ^=03Fk3lFMEFllYUf#p`ba+ z^O9E{cB>G?G{^15pZuuZjt$}1Ey<#CkV%H|ZfPc+jVL24*qR%2)D#7VNZt*jy#8+b zYE8XVWLoTZ35T_;wPw+Elti4H)D;k%3>9=o%HsQ^q+9b;APJ=TA(kZ@*)PrNIKF@e z(P-TqYr%oIqgbf~bEdm(>tmePtK^$qE(uJz>59dQ9`{mVLc{?t8YA3dPwS!F1 zFz2El&r0kXeAn>WJSE@{Vey99ts?Gd-&Nh?|B0Q@yRplS4I(OC$RJJ>@_1O#KvIPS zI@e0(BpBg(pC7$_OOh%pxj|2?2MRL4rEol6<}A}F#bC;s`*yJtT;pE*ThvKG>|;+2 zQ-j5&PVJ?M16hSIW^Y@fthIfHHNG6sL9io~k7Hk^bN9Mn(mBmW-T=I+MqApBxu@I3 zFL-~8@RlT9cHmoXbN||k-rOn3$UnEvd~Ev33SvfE*P#Ev3?C>$h_QEhOugLj43o(} z8ztZ;Og(944n8|*(J+IDOiBmdrc^#I#Jnyf@0sEy;TVPIukRr1#u7%bYfm!n)n9=< zZXyT6A!&Ar??)?r5WmNXN~u~Qt*5gKy&=>gu-%$JSN}vY=dtIy!SvLe&nJh*>#m5Z z+H7a7z4u*3CS()*J0YERxEu4@fHuUfNg4SIf#f@AFy`K~ImyFDpR^cIIse;;JVCcu ziD&`*YP(0ATq3RL_XLn!&kGG}3S`!Wz zG14T)_r^pUF}RR;P)N{c0Sjw9k3x$;E)bSCtdz&y$XNiCA$Sp>gWN__cc38nxm`VMlD+>eiT)c%FlTH};PS@LKd#aT z)u@`^0US;(!apnzum;r7q6D_ntT|$kvVrr-!yWc6JJkjE#*Qcz*>o7taCo%Qse5qB=r8 z?YaQSW;O9AY!EQ-HHF+Yb!}3r<8bdEywzdO&#xQrmNa+K4U%FFl9XEzIwV^=wmJ}& zT@6HOCRX!ieA*F=GsWN!>75MU>7QNyQNi39M$!h>uKD)t1AO!MHL=%+={U8dX#BA6 z9#L~Q{9BdP;}r7LM#jGGB}8T-eJ_(oSLyX$_BbA{z6(bmy*bi>7sO;35HP>xeO&T0 z-qoEJ*!4U&Uf61e*Y}#p1NG_Ljk+>^6)&jqqu%0)25Y3Dq0}Rq;!H56=~Q%`{K6H5 z#MJn9bQY3c8rM>V;3Kh;?1x3Mk&xghlN%O*tU|Icy>$%ewtx*0E+}A*Rf;k9ZQgL7 zFuC*MXPcjM&k}>UCj*u;l0TP0bOoG30v9fur`!AkL zTe!HfU>2{*v*%u?G#}c2d}^bHek82+j9pE*+u_GM;3)ylp)YDJ!$~@;)seKb3*$$gwf1`gMLrf$1w%&3 zb>ekuijNZqLjUsRQA*$=i7A)YY;C@+#;KG0;p8o}xWlqz4Nfv@&5%lueI5<-Yhh1c zW=T?BN)F=)Fw}-qD%xsfUh&pkg~W=07mMbr__V7!zTD+cB-uDfBO|Mxk2Wd~Z7w$u zR!?Z^3TgW%8NT~)6=%(0cb*yQBoOYBdH<6w5&HZte5`PE@MLbRSkkKBqnBM)AQ=(l zF4e=*tJ`5Y{ZM{b;noY!fei!MkLP!IT}Ecm$|s>+&Q;k!07u|0#$c!jOjBBgc|Od z$TkBs4YBhCEroYuexRqi-dJh0YP2}tdyk&}@KgUVWHVC&LclKa%T=+`%(&4{S4xr{ zSQ)aKW-W#(mvN+5UP%x39ElqylFTe4VzDT*H3~nQ>5vS_n}YNSGm;Z z$ND6I{9q>poR}R>W%cZ9|B8UHX{6)XqSErX5%3!SAmDWok|pE^v7!6iM0;X5ZS_Z3 z4SywLtw66E!h!CCKePm7PyMz@FB!rWEba3+rqhnds2z~tZg*xwh)ci}7OXY$#~Z-i zE4-!wjDcnzLK}+Wjl}kwx4|xY{^{8P7WMvKp<}|uvX5z=^2AYgoJz_|O|4rrRiLH| zoobo@`ugqqM0ErC#0?yps&Pnwbb@(elSZmWYAC~jwQO;1A1bk;f9%5i5F7fC^=A?b zd}4h=dEJ4T16>ktwo3MHc+8}oS9AX1R^B@GUJPn5j|yS3dpxnfnqC0)PQV$@{0MJ& zR2-FVf>PL+iac|w)JyHt8`6%axJa7Ur!iq9qO1&ufm?L&8^2*a-^G{@zZrTZbkEr-hj{r18wlmQ4ZFoR zj`5@=6R?XR@uL}3;vfE<*OU?)XdH5#|5Li*_Qw7|x2hcrJ}b*mE7#PHJ<71Qi~t1_ zT5D(v+>Nt|RTa!A%lKVObwISDtH5TQOvxPn)!2!e2+u?i*Z*7?N$gzOb0DBMW?a0h za?Hs+`P`kDSj_C4hYtmlJO*rD9Y`HRm_Q?uX6{SeP9NuddZx;JrkwC(Xb**;h9t037dC24%{t##RW(Zwv$~v z=xbQQH5azU!J?0RxnxVgqbXL6Z;n(Iiwl{kBZn-#zfx8dq#>)5Z`+(!(9UCf>) z9mX9gSOG>>26k1h3K4kDNZ`Ic8_wtG`wAHGn9RpL!0MP5J3RSEy+OC9S}fZ9`r`3xOYxIDpDJ)l2neo%R-zzTJ`X0Qs=46 z5obW{ebm*_vP9k4W$S~ZXP!jFcKFb4ZMNO7|7H~ajDw^)`ZF3M{3F$|ryr8nsJMDp z!uO9%#6W)t@Y)nX{+~IE)YMSMc3Y5anLoKV|GBRyAnA@I@<2%3`G3i9T^PiN*A&lhz(ts2c6rg&S`(xtDKK~={ zaZehO^eCKM1N%3bc`KwLYR%Z6d+kV@#A5x%zye9N&qMM=HGnq_+zQQI|n!T-aC7gszo2xdR74 zCE;Ax%1|tkTazubizifid8eu#qzAV&fxB&{1g|fTr~Tyx4GtSwd~OHZeKy{UU@56#9CDJ9`64E6pf^>s)cXxM( zlynJ*0)ljRNH@}5QqtY^KObhC`Tpj8*J90@weWK9J!hXC&wieLXR9oakO+}=6xg_F z5TS{eI)N<{;3*Fb&?pz-OJ(rQGeNz51~Hut$`#ednOqc6FNx)h06=-*{?gEnx5#dKK+Dklp$u;jGVSAhC#m)BTpzp-U8t+5Wd zY~kUu*Kj2zd*k`oPo6$a`Pv$tYY6Z(YRj353eW2^(JWy!Wh%&eA+8OkrIr~DeBc?9?z`vC+?ptSu)wL`-6Sf4a-Y)fz~07X4UEBN<}3g$fNWwnqmCpZ#Hx|9{qCFp+`ikUpG~4#s8U-Gc97i|^w& z&^FUy;)JXpUWsHf^T`nZ{m(pwZw?TP5m!m1*G%#A_aAugItGBNM=*17Z$i;1vRnd6 zo?9;gqxlKcelq5hMcIIa8zjhIe@lTt@&{XVDh39x63{}0sWnrF)%W_jSi5wZ&}RqK#X{F zB9|JNjw>({?yA!g-8Pf+J*DVfelQ-w6*3E8K8`{HD}~wcgFbWs&IiaU4vg2@8_xi? zwiGx$F2m0F!@waB@LF{P1nUuWk>nfr?I(y>vcq5AY1Zc2Dpf%kxa$L{YX`#sx9pg9 zw9T9%0VjfGl91Q!C(uTiUK}hd*4i1S6{dFKBW|yBMd`}FClOEUwcFU4n(ce*Jt~S4BE_hch}Z> z_rXM7zmwodf*?C$uW)EaOjlsPF(}m#@I3N2>Q97i;7c-%$=qrBAaq*n<`L0pX>EDg~;93zMaE^DDY2y0)Udbqf(zH z04ES~cwVvD{t}uVy*gMH)UyqFFxab+Y>9T>DbBz0pKvM28r{0+CxKd3_J`k-Q1_#H zr`@f8H%TgmRqRZ0vB6cLNF=Y^bu>v|cRpX4;XBak9EO|T7?`Bwh`a-We^WY35Dx` zzkInWB(MCCo`fCDUQ86KXO}Dh*^FWLM}ZC6q_$6P7xXG6K0(h3#6eESF47?<@$jhn z&|A}k?;%mggiw1RL*bh=syQq^Bq1xbpB+f!P6S#+p@!Iz-gw$IN$oTST?G5BJ+o1-s^$s9yL)_mQLq#w$(eo&uAsfgEwJLKxUhj#}^}4$> z2JMQJn=ijT;1!bUZI=BsP+?kUFa{#T!3!n@K-N2`NUf4)Z73r{3Fy=@J3f&yOTGl= zBh~TtV>8bA{^B9%AjEB;*$;D!XNH}8Z&>&$+U4L^VyZu*66wn<;H#avADly_9nw}QuDdBN*e0a?>pkn+lbP?ZbPN=T$~dWcjJ@VUGQz-I~FUY!aK z6;u{>Mc|2GGib%Br&OCyMw(3&Y<4>Px+^1rH9A`>Z2^L!FQ8x2TRlXrkn`K)$uaOA znz^zhmtXt{feHOdBV3ZSn>;SFTvj)Dp2y(z5^y<$5b}FT0vL1Fp;rr3G74~bq~y-%GMmI)RzK& zFp6acVrIZzJush4Mvy=O9|B!5)TGzR#@XJyM8gdsh)A*zMV4JTf#iA! zp~&h(6{<|y(wc(2@C_Kp2(v^2U1moZwgPB6y#$TzCA}Yd-OZ4!aTcUsraM!mb{351 z6-Pf&K-PkSgCja!W=MuL!9xy%y!6{vi2lJHP(WOGVP;VDQL`(xeAef?+iPyhw;?1C zd9)<(9654dg;8brmQD+*EoXC%G5hr+sqE*PJX7};8WF)h8~x=tKSBKO<8mb&W&=1( zYWV;U504OK_#e8GkU&{IoA65A1o+4HZRO*drN^+(|K5#(#&M6&T{Aqpktu(`uYC`F*q8p?{sfo-Rb4wTeyE*28WauWiSzz zmzS4a_-XxqQ~twW40L?+#z$lO1cYS_e0+<@4-bFyPhEKqtU<9rg{gMn8i-|0&-dmb zxeMIG`=fi~f+|4prb@NOMt7#!o8R+dIhaek1AiT`l$BuxhJs$t5L5zfx{Wo&#CH2= zeOCuk6Ct@Kh&kDS*v9p*odN5OZo_uj{4`fGpJ*TY6q%6jymhH3{LfngxnPDySj-}Oxk1lcu=k0xv0EOvqe&}< z$xT;Vw6$W-+zO;dcXD5XDgX~sfh^P{vlu7DzIIKY0GUx5)!W>@hlDCrMa6l0A_Ah% zR4q5k2FZL6{0lDaPF9dKZ1g3{OklUpunt6ifLJY)?_e7DC^&LVuERwU_G`Tq!7*ps zlQIbA*4Ebb7@Ta-51}KpOVN3E<~_nT$aPQ{>buat)%HMq!1o~DDQ}Nd)|gjkmJ*DU?AZzzLD0tS@K72C0k~B_E2qY zf!y70BMZdJbnyf_F<$qxxUi<}hm|XJX%Kj3P3Z$$VwysL35l2b(17buo_1f@u1g|Y zWuXfEZt@(WKla;;i*s>_gg^N~L)acDE)AYQ5}pk} zsOToiilvgt0qT@KSGDER1KhvT-449ul8+F<0-M#GiWd{8UyH#Z(~op#$D&ht1NbPy zQI)PKfBjK?XftKaBGLdy7s2BTv%PGs1{bCX0`3Iycp6MX_zc|#|EmZH93Nwm>9rbO zzGFLAJFc66R9^hJ!clm3n}Wo2bm14rKsvrTlMx&g)Woipsyr=QRL=Q)MX)2UV&{9* z2ZbU}w|MDV{QZ7wqMV)FlN~?}{8W3UOGrq_oOY$}J-B?PJ2?2de{@tKIog%8e_DjX z4(nTG+u2y{#Q4=X+w^$OhIuaI+INqwxrH?sE&nOLxxPM$1bwnUXtT^v7GSDR1;ZuFsjd!baUK* zN8K8EFc`vggRWT2OMxE5#$)Jx00~W8(yTKD!`kdroc_3V&s7amI&oYvi=#8uLx4vj z+w=59MSDv^vZFRAD5R3hxxsnXjB>{qtrUdFv6FpZ&vU+oK=6W+H6FRFLhHj{xuJ7G8jcF&g8!?`& znA1REatrCcm+cZ^ z&gm$b^q^Q%+gM+wSiZTvU31FXl3=!56@A!Mmq%UF>O_1s!71$K?|ulX%P#Za>TQtH zo4lvpseGI9zIJR~X?c(e3yO$-&oF6hKcQmTR8cLzW^zgo=E%?|BDC!cT1V<@k$LFa zg7I3pGnsHVixdhXC*MW!fVEVXg_{cnhAkb6q5Ng=sGA#tKsV8yOuK43@hsZCZ4I2F z)B6UDc+$Z>s?cx+(%6;CR;C;A=o44B*kENpQOZaI=KTOt-I}BbgQ7{w;{&mqnTu{= zr(KqCr#kQrmlYAeDn61LST&BCW=M z75$iq=3adbc55FrR&RmB%mI+kwg={M(kOyCT~e`j{r+5?FPFoX@S;Pm7+deg=nx|v z7()XF#pEu%sxZ0Lt*h}Sas5V*vFWk*kx}qzA0jVs0_Jv9b0A;&?R|eu1f~V`crv!? zFS8db1r#q0244VgU$%WV(yHMW(~81!G*-{`f@E*$;H_s4jpHpc20HSnQGv(fJg z8AsIDQ9>d0%B$3sdg>_{4)etK(j0j>cWJ=EYmrnuuIhkRzSg(|ZQ?g0y!9f;X}cqS zy0~cgLO)rhAN(J0268ph{Tr;ozBP?H2Qg589~(*<#eI_IO1Jx56z`Pmr`F4XTY+>s|$pX0iVq&APY@Y9# z13-(Uoz(X+Rk3WU_4@D~(vK6}s*zF`ib<9TfWxQuXYgl$N?3%*>w-iH!@gZV2?YXY ze{j!rl^6l)z)=7OngA5PT_SZE@QBbT#D4-y2RO+U9D&`DOr-imF);%Zl;v(5aj**v z2+HkzzC>OP?~v-Hz9NND$yL48Zohk?`5OU@DvQSRUQX;j5C&A^~cCicnT|I_D2@R4G$eU-`=r^$muqxL=SE}hX=>f;@t$o+@@TKjsR|6m8Y|0D2g&@ zTNT=GAD9up|E?H~*M1oaZs#SuC|}741^QUG*E1+BRVWk}$~92zB2vi3kP3`2qwa z*~Q`%TiZi`C)5^9vpCv~HRfFb%Lrm81gj156C%nKlwMe-75J@PVb(`7!}%4_GvVxU zFe@DB)r4q5H!s|W(XbP}TM0VN{O*|Awb!8m3AFnDJB!WQR&>hwO0OVbyi_uC2NUXB zjdV!TFLiP}#IF#DfEkiF&+T$R44P9yRx;loY|+wu0f0dOb|zbg;Mngr z18^sL8Hkso{M9iJ%!Og{3rN<;PXXdO)dB2MTm{rXN=*YIi)eN<&=D`#zW7b^XGw8C zmmhu6k*CxFO@r`2$wRHNIaU5X>53pl$PqyEo^A4M{DNZSkW!)V)M;xhRKb6iSxz z=4Vn(F!xL=i&j)lPM`%L#1HDub%QxkO7tz7Rom_Yx7+l5@-+2OKwo|Nq6hkZBtq*F z3pBv={Q(3a{2ZT?7;J1j=rna_3I=;9c@bkl;4(3wgvtBrfx&x6DQX&k={?v#z4FSyH4%B0gB zuMfnMzWY#9;9R;rSiR^)Tike-;;_G<33T*y7qeYUJkW zwf%ZHtM!6LBoY7KtT=Q*1<23DL1sZ+;K{kiW;XVbCL6K44oN+`9Z@ygFfE3UZl3?c z)kde3>q}eGdy{AC0??=^Q+4}U6-2Dcl#zHOYqaAZh=bj~zAV@$oCQd)7yxgwLFx!P zQ!i8jemb9wvvLjto`Xk-|Mny{j^@3%)BeIM&SLfIq9y7$k~8o-{UQ1??#dE+1yOdZ z1UIt6NxJbHuvK95S+c!=GJQRjut8vdG`oz{Zu% zPkw9&1OtRv;`E52XT5Ni+&G7IBu}gscAh+A{C>29KdTk*YinF0rK7kjlZ-HR5^W=f zQkQYM2dg9(10fw0T>l;!7JR4aZhtx&2FCsm_Lq@n_XhKPxXh-3lKA)OafPz4Bh5~u z%)&z#x%V5$KpXZrN|<*^Ndxqkjy8rEP$qy2jAm%M_ytuRGTs&RDA3U&_nqw!Kq#_J zhQE{nyt5W`X+b?H_ne524w?VP2E&L!cgv5D3! zRAbA#RI{CKvJB(NI1}4kX!z9_)WWp+quNR=kFsqws<}vHW?dtBRD4bTGF$i(I)=_P zM)a78#0t)%X)WXgzfwiH%2Ag{?9`;JChr1jlG%9L375mUQ1TO_bZ?ydDO5G3RsKe5 zcfBhFVg}>-GNlBtUa66TW^^q#y8cc2BLJ!g|2|slJ38uP*!D)L9wTy@lGvTCmXXhq z++0b4&gXk>a@w zR^bB0zNBWhd4KvLuIJ72#^UN#GslT*-8Y3zCdufXOiqjV+xHPkcgY?nmsZKFt}$+5 z?>p}hZgZc4_ktx;F4CAuohnc*KgrT)uf^FOdN{;@E2t3-{RE*KG)>4sfR+cq#H)0G zY-~L2Q#HIfi(3g%7u^{E85+Yhn8G4D0s+WZW{HK@T4!~NVCS;PE{4J{`qc5eY0Bz{ z746BpXwuWC+f654$bnl(3xlBy@!behdF-voXR5KM~`dc8cF_3U~TKU9SuBNm%ua$M4VMU;4WA$HNU!2Y}A#`(n+Hmh_3hBlrM*fpt$RM{$96vlgR7#4!-c zhyfXS`7P%!d-X?lulb0?LSH03geYw8#w^k$lWYOZs z3bRaIi`JpUyN^c$ZS?d=+S2J3L*jg=Jzu7leK#&EqG-L~+l=jR94D81Bb^rEUlr(X zoe}$^jvdgZfgVaS=)vlojSViHRI)gg{CH6aw$zMh(P7*iR`yCFZ$5$NE28=Q!QY(n;;D0aN!9b0SD~28Q{<0+Od62_L@@^JZBLKj z?CKEhq@lz9RUKjVjmpiY6)u-y_TJzeY9aZ6LX@d4V(InmP;;;Imi<+*_G-)Fek+~b zr`IP)uCKk<8F7{j4Q}R6-HcG-lXzdr6URDugMlxIpL$cV&sy&Bj!Ql2F87c!mv;4P z+*}STX>0k5ZeH?EA2Uj$DC|3P4Ss8D>kH&~1Kdr(msPaB7%#t~-ad2<^ z(ynaHNQ&U1g3Ie(i2vGFn(CWmv?2{g9~rM&!;4OB&Vci;2}kEdx6v?;oKjL`N%4oX|?RPM0I^RfYcO{a#cI&z= zX&2BHDb*{n?Uqfh)gbF^$0#;kb)U7`lOkPa=%TiGey!~-5lnJSuDR8fRb1wcY<+#3 zh*n%Oq*-~G&v^P-N`lHk37XqA$;EzHePB@V0(n3GfHDCT*NVt>sLcfR*V3IAh)@XTL{UOOgJjT` zAjN+Rnmh_aiYwzUjPP;wWFE29EKLC*#h2h3RHg(gtv1O0Vjh^pc5SnRZST=6whN(b z&&m9xR7*O7x;yFEHO_t*YFRXf>dekjMr`$-i&Xa{6EXCVSK16oWjcL>KN?6rj&_1) z=^py#`S!@jTl&aYf~vMGt6rkPYT-Ddf{15GT{t`Da?HYsQnh|JMC&F5hD=shTA^;* zW`F0rzVSsjqHFr(*-X-ATCG9Yjs9^ zrB~7w*7|EDxSAA35!AxB5l>fQ$|S6&jT1Ns4pGLUvPE-NZ1@~??8m>=cbLxl+Q(ZS z!{=!(Kgm<$YM#{SjEi93xixr$vwVNoaLRo9Rf-F7WV=a8CEb19Ho01_-s61Kkf7N~ zNk;730s`2``f|R}yIkyWD>6rJnT9^RKB^UNv*YIqRFS_&X{C6yG!E+FMw8#bv2jN# zTT9dTwg!g%+OdXd5&;clvg`BxNxv8MGgT(TtyGJ0Oav_b;rgZC)mHO*Zu#cN`cb~1 zk!-H;iA*F?bR;X&I#FZRG|@4W8P;9Dp`h>3IimeVONg+` zo8K}fthV$d1^U6UN2h;tRv3$w>?TEw2r)j8KH6ElRUfVJY3HG8P*2K z>ya}i&b|1)2BQrUqGKo7vby)_=SRXuZwf9PSQW9j9ttN{w3PdHd|I~t4jcOHXxX^l zu-hOC{`nE!as<;OvH+4abFqOVU8)z1kF~SzP}2C;3xniKU93F!&WJD<@n7+$-w#}$ zw-(*~;(m<0ra~UEPwNrBe6HB`wZ=}Vq8vI()WJm2zkb1NHnXK1>7B5A0V$97cUi?w-GYlH5KCw}a3s3)2XeF|)Mhx$Lff zCeE<5xr_JLP<(1W`4(r+C+}=5bnYgf?a+kdY&q6HWVm-EI|>`39%3KBrjG31m&#j^ zjWL+Y6#hBj93g+VlEc1RtRq2Ol3LlDLaRH+II3_nUScimr?C4z)#KBhYNoXoUi2&W z=n)2Y!cLnA)x%QziC>Dr!;N^|`4mS<5}p=cB$1oA?mUw?8NaKLRv&#~7UCDh(G7!* ztJ9Prx*1J*JkxysTh;n?J>M2XPdqKpg<;S)O!Jl<&W1sqGa_rKEoHY&`t!&V zOoj=a+$N;*+v50VvsUJ=R$L6jCP_DE8}Bax+2XX>Qu}Gbyn)tzj5h zFuW)@BxQ+53P~E?h|Js$=Cr{)VOayjpPBbWRS1!EE%Dj_wODPxL-LCVU)WURE-Q!( z>*{Beq(;%xFGlp9d}4ModLEoHJswTMAFk8B#%id|%h%rIHhNRNCbot|UZxY^Xs{X5 z^~`P~XRYz9hnCWLxV-x^-+ji=s89BCjEqoH=$swcjrG=Ywr3vGhFpJ0hE?#1+ z6O#D0UR~a+j%9+ifx7H0iE;$JwB)D{{-?`^2U+nm4CSWSJH_9go8>g-CQVzcD9^3_ zKt&`B3+h+FJAM(%=iMPa?fN?|d`C_>%o%+@Xa%wI=~ghVOLXr?691t(82czd(=}5r zeu=^I8Pd71=e8OpX|QEAa+!cfY;bH#6;1KOktYSzv6u?eQL|BzorVxGjHkw^pG&HA z8+6no=1-T}Uf{I@>Yhjmv9B+To;WdSrd4l?1u%1_(a4C<{{BlrWZta#lXnyac&sL$ zoy&Ntoc+~25{0g+3e7$^-k|{EWOTyIR%!z1MxW_D*)=qq^ zkXC@3emJAwHY%1mH?++fvh`eWeUS}4qP?iMPo$44bAhry=e20QTAk0ceZnmx+r6V* zX0vr;d17O?Wd84!ZYon*gjf^i*SkpNi!raM&^J9IXqxdm{ezR^ zg)bSOsNQIC7w=w`D)3A2vOSKp(V5l}i{Z@V>x$y;%@-@`wcg&=dPOT%{-UG7RM8+6ZZx=SDUM@Pu(X8T*J(mr&Q0qw{{5}R<#Lem$(0!Xo&s@?B|Dg)X6-yk3i=rT8Sr63~N5I0+ zJi-2i^uDzF5vdRVC&1W905HrZL9I?-gb)8`#>dpkMV}Ual5nxRmK3)WRgt-Kh<8@x zWvL&3C?YZCQTQx4C5M&+%LJc9Lcr9vLfw|cIk$Z`Tt3mgW2o*}^<=*)`sQ_d*a=pC zNsw&8{Y;qFwZ)V@L)z4^xww4gu1X_uX>3YkCnZOq+4G-kt*qIu1HWdz_O-sRZ@?>P zX~N6kO6zhrE?(aJs=rcZx3=%yn7XdxyP{U<=u(!I$t|_VZKtGlzxYh^PPq?OA}X4w zw{u>5J1|Ja1}9BtCaht35ldweMrc*O_y+H5#jeYMU7&$zqFNo-HuT6^ESGun#IR|w z!ch_|!A+{yuTUzzaf^IsWQ>mt+I)>#WQM&Z$j+$nIy^}$D}6ruWcqbMcBP!CKMDvk zLnb&$ZvjgHS?sfhLMx>gpy5Fe={*}Hg*XxyKq=A&Me%3je1PQ@YwzmBB0oh7p@wQ0 z=`h#pf24Z^1fk_ zlZGohjT+K9jmE|`9vK)`YY4nr_b2dBwA$yQ-6tuGqva2XUDW*8$(!T)ghP_~s-loo zDlW92$Xj!geTdPp^r;Jt>uZB*@%|HiXQ7o?Jj7RIN6dPSL>mO-{jb|Ojh02u3b6T9 zldB|$y-Ff#L)iq|2o+WjI5sMr;}RStdKr3=mb=V(%wH_!SVzzN?vh$=UQ&-KR@0u( zE(ZN@dh55to3wYk0QOTGx*%&FkI;A6i+YJnSkneuUe)%(dcu|XxseHzDv#x>;0;~) zmSfDbHXm)2!$eu5mWaQHeK)4yH&lo^8=$I=v+<*-#`zO_~5?mSF)I^VG2(g zjG+h{132Q)&D=gwDL|IZXB!{abBG0!z8=p%|1xZvLUyDg^*X%zLlP_gS<{*p(Hds9 zTr#o7`|_59$6hLyDauu>YCPgV~094q^{vwkRulx0o1Q10xEbu1Q% z7Dn#VdJiS9&1;>mE#lq7_e&Qb(&}=JoSq^$UoHh9Z({YnT0Hf({=J1AWlBXI!%wcg zcO#rK@e*x$FSa4)_UJQgZ^AN2(`U>OD6aX66+uL-$G^h?9i5*S_AzVle?tydhQ_ z>=sj>c|GxYTx65!ZfO}Gw^=Z?GfiA21zLZih@>Be&9H`as4tHUdDSDDAGl=^0fX*! zjI-T1S#(e9j+_x+fV*tOSYYbImT`*D-rPyBeBVh2Uk*R8-Fvf2vG!yQOgYcTUE^Q- z==OQ45mitMgm{S4il$P!>~n&PM^n_66V$l%GwV}+zp3Ot z@s{p-naL?VI_4S^d)T|eCwKNMIW5j-f}!YQP548?ocUG*`>Xcl)X$wJ%K0Q0tuq*} zk)n|l{0{C;2GpKS@h9qNZ;D!ZjcZsG&H#mi?8;5 z4J8F$Gg(x&hvL~D;(YS>x>*}WRNAfA&7p`dZ4($8?81@fXUUEwu3!-S1Ct7SsuK6t z3vX_~h02|rY!~Y&Xg7u+m_f`H#Q9VxJ6}MPhSFDxR&WWm$Uf>Qv^bj_9?RHx}?omU9^%r13j*YqqpFvt=HxME&xN`4NF*C{q_jIw9Q9 zB@w~!q5xDl0i>|cR5+jBfkG$f@Vi>&_w+(5P+ztb;#y3XT$4VAzd-aAi>2J0Us&RI z-frcK*%~&u8)2>Thk^F8uu$+DTWoT!$5ne~&dg+ImvHY6Xa8lgDHU0Vl z)q~f1s+B3A0R~iWj{xn2SUgSq$^QOy%2d#n3ORgx(j%qRVwKXjwT@gAB1(#V-Gcg3Xa6nI;;7* z8G3~Kmj}oYVw7Kp-ZSzg1{j^T;30l*?f8LXlbltCl~yO1=f2)!M*M+hXNk{-_^Gy= zFPLq(2GfPb9vN}|d_Kf`{)yFWO!NidrW$%tUJ*f#TPMst3K&q4sk!r`>V=m$pfp@DQ3NPxSr%!<&xX# zWKMwx^k~Gs*Q6i6i4*nY2ApnW6xSBpxsXX@a0}JJkIj&DfA0S4JHUa)zo3Ak{VOW5aJy32);e#O{Uso za?836gMk+a+bV(%(-AiQ2pqwH!Z=EqeL&awcMQV5BQXGdg#9K?hu^Zb4x2GLsq#Pj@495IgzM(sv5m7n?WwJ3<}$`^t_*77UwwO0Na25*M*h7YbupUtJ3A zAS`Q=zkxn~_t{`YH-={o-49mtDcU1nAamD5z^11I5}Y`|h_{_Ig1u9N9BGpzc*$te zzy-EVpqLz2?`mzteK2m2Rf_>y@#=hZTb5oV_n&8ebIGv~AAn4e2<8RBC^k<|cf)Hm zduh%p>xa1(jQgeQ*kC;vM?PpC#=Mjxb=^pFHkhliwFAPVWM20wB(_pfv=9Pc0P2W> zZ*j!+HBQU_KGfDzhTA8FLaSkbF0Le`b@q$t1|-4#eEfwSLTG>_jc{w}O>hC3+f3FN zZzE!OI^@X*rwk8)fXHup3qs5Qqs|P0432%Qom7n22?k_ORNxazKf`j;8|@WW2MbNG z9j*rnY8|($VDgb8tF0CjX1DCOtEleSBb_@)WTqT$pak%H+YTf7zI$+fA0kMjT;NGJ zH&6K{8Lu#(U+3d~(lv^?UCF0B%=vw1!D9=fG(98TpYObrw3*^Jt%PEO3rXl!yWMwE z!6HG@(|E4QM3OGzx$x@~sIHJ9f7yh=uY+IGu-~OJuZYQhyb928A9`hb=r8Le%7ZUm^EjI}c2kzMNX^Hf%gPh63BtF{ zWP2I#-OM3Z=d^v%nxD93?4Iy4FY3Ecdmu)*13?3<4CPSvhE`VaLZNg1Y(@3ZYk6yN~p5aTm zOBHZT%d47bbo1t*#4kyWilv8?*ygO(yxv+qjEp`PQYK_alAA!COytVAL_M==|DN=* zyMDA^(`e__Yr1dg8p~Tq)La!Xv9w1x$MptYLm!WWX2>Z8S_6(wC$)o{qbH#x9~GSu zgAZa~pKfEfkbjzXg!m*RN@A61ZlI+}er=yqpk6JVK&Ptrm-CSM4AO&{?9tt32AW-4 z^R|b`Rl8ZH=`Q6X{mk5EIOhO&btd5#c z@;sYc->4*bG@VR5rdT|)neUFa-;1S^z%~j)!TBdX+Q|o}|9fMY?w80vRd|xmCoV^E zh_naLlA_~jm3u+A*An7}9>ITn1djvl>{l$PnJRJ5|10yQfc(8Rl{(Hhm=9R5Xh4r{ zl1Orli8BmziIG+eHA^_bR|0;}JEKfK1K#TI9~4Yq(1J8iYy@6@lzUY;KGF0}1QLLm zl37h-TGFNg)@88V8dzpBObTK?2!;>$1^*R#w*)9e@xUwgvJCN%0WMA?4ejX7N66j$ zq0v!lWUda{kWY>G=4$84CY}z0FeT~(`I!^`4A?M7;Fl8MzM{ zw?MOAiSPDAp;4|MP<#J-*D$PCtAN081PG;O`+8Pe>cl63V4dWGaJ#2U^$h_NL`?(e zr4*~I7yk;%f4!|}ixdnPU`Pc(l#$jK?z)VB??+&=8Cj05`h2su_bx?y(07o1{Jpe3 zVQ@ga`o8J@&Rq-=B@o-*X(EOcLELYDQXY^uC+>g-zdP*ae0?=vbtcU}??}Ex3jOmL z=-I>psV(AJ>z}xQ$OlfP6+|?RI;8|Y*P;njht>}V^xsE3NC4TAznY3Z!?Qn_9E6f? zI#rVSiPQG2)6NtLpcN#7&(uxJqKA<~p%Fj)*q}pM=r`GKNV~2^i=1fT{JSiCPCH48 z#af!py}qxzQ>~k*0i_25l>XTe@+C^>DN9?Rc2-kiP%Ueh0`J)L@Qy%sk7gl;z~p&z zVQV^5k>_!HI{6S{9;^pqKtejL0q}0IwZOUbfa5SfR_XH_5tv<@$KKp)YVZjZt&))V zMnGwsET3do>>w5UbESrm4p0SvdZG2jo;&W}nP#2K;TOPBRJ<+|Stk{ykw} zQ))t6fa>{#(!Qkh4p9H+{<+-^u$*p0h6ZA7ugh$WdMByx@AGqv3xI6aTF~+zdlzka z1%t()MF;dgBkU7EP-H7n4V^;-Oz+t#0O!bnj2-L79}bu%&HL{r$RzM+t(*RO z>72vfbl!S8m6A92ZMiC?Ul!;nL8i(+-l_M`Qq8^5S?P=bTq}-3qLLo`zlsr7Eufo= z2Xduu1sPrnAW4|SYu5>6_+PIe{0Og4_k11V7C@Ct+SlpAPXXYr(H0DP4V76@!~P^W zFoS^%_BsAfnGE*#UH{%u;|;i!&2&TvNY1jIt(^oCp}!-7RYG!xDA9r4`Xz6JU-f{G zhn?`FrGD2h{l|^b6WgqIqweOMgR`6nGV=P*BEI8K5X@6M@z#kTkTYO=!3mv#d~h|C zD!n9+9ZTYm16+CvnM3#ykP`ZU|DXY#HD^I^W8{Y$19pBkfJbMVW-PECyPH4#+vdkLdWz(?jggx23rG z?mN{gP#cp1nyCFh56ZEV4;1zVn(G)~kOhEqh=B=L|K}}%fFTxq#|)l5p4;oD2Coi7 z))OSTrZwD-TUpq&tv%d4{yOR-&v2Rl`@EnzBo1nYlfi*SkK>4cF9f_0YOpgge4baL zKw4)21Qao#GE6o5pN+91dDMu)@8$8@^(afd4ukO)a?4z>$P6xNEFKp&J;^NJAQ@8( zo4L||F8s*r?ga7IK#o(JEde!(47M}K4RBKZ;u`_6xe3yP2D*)G?cFIwg8x}yc&LWW zCa>E%kL%rPKowh!(Rw1x0cwyJ8>RYPy#S3h1k@C_95=9aZtF8STPk$_I9>@j3>rmI zFq~NChY=GvhBjiw&|mR@B}5zpdo}>WO3QS9K<^S5fGQ-0+u7YY1pNY$^7jhSOKe2Ngg4G)u#np)G%yp zKopyL8RYwS)CGR?3#lw1;z4+f_?$LxC^(hSZE0De`1A<{8_A4M5 zQZB&(J($1a!^5S3rPF9*3%Bph*+RjR zF5%Cuf$!X!EM@=}lL&|kq99?IA1UmUFl7Tg9;FQbZH0OrCdz{aCV5|NQh`qc#8s8jgWiQ?5~Bb}8jSvPV<6Eb z0qOs61~|ku+3HZk4<>jCCSfE37NB`CF-SJBciL6H2*Ll?64=zVJq`mWP(W5?58U+^ zh_^=qhlitr<0E(y#TNjK1{u=?%hZ4E0q`!NZyzD+gA?rh$NVC}=#lvxDLmZQc3BWQ zD*Hs|m;Z6ppMk&eOG^dcQeePkHn0I+AqV2Vo;w2FC}i@*NTa(mq$bP)V?X|L>7#2M zovw8t6BW;qOrHCh?X&qfurfjr>D&$IU}HeVxFrK@-LfF!UF<&zm~YER5ge@@ui&h|S15X01xI5*~&3x41T4He|#gq%xD8K=+`LmMG?Ln_R3(P}c1{tj@ zP{f=BF|jLk{ktX_Z*;)48pwxsAo&3WsNU#*%Pl$hw$5~xS^+&6;HS#+U9O@-QYf9L zssG2&AF-e$`O|6EDITp4;Qcuuc(5>5XG`8_`EJX&S>S>HyNrm~kX|s6=Sej1z%59c z2uXb4O*qGR-A+CNiFP;8_GbYM972}GGuI#fCvaI2mw?0?mr=*ZsWzBn@!22=WFb|S zi8?^4zY3(gBY6r`c}j&T5tXGT|5!E$ib|P5Xv-!TNr0FIw8>V# z6=CTNzQXyv_r+TCoii$||2Q~2xB`t@dGICTyfmVQlM#u3FH8rNHjBk3O^BEaIPzGK z2hFJ9g;D++x1b6JT2rm2)bz_=KivSJb(L+w0Wx%vU6FP(JtV|}BzN}Vibd3^8r!ct zr(+5+!~)Q_p+x*md<(VqBK@$H$@be!KuU(%DH69>G3D0$x_UioXKuA)7{>flXw=KW zl*LGUn>UP>B`b3!6PS5KUquSr|7sC7zWb&TtP$b{F6+z*dAYcy^C36BlR!r z(T#aiBGp$&xuR$?a24i^2cwB5m;FOoZo_Gs#aPZ)L1g!^ZFr6X4N1~kpjyH5WC6l2 z)QGvWLo8S`+kn(hU=9w#T~ejRwEWU!iZ9GfS_?z-4Qa;*O!vh`e_JgNq2&hp+z zhcxXpbKh(jHzL^EUXXwHQWwk3OWkVIoZ?QAYvyq&PD;^W;bhJ;ie;;OcGcr|l)1kmi>%H4 zF8rn@L_P(3jD=#YFR-r4A!DFyyCl8g!#{QG<^`|mlBUh8;&SA2q}B(go!d4|zp3`Q*yyB*I*$yWhWqUILAjufyN^|5&kb`UNf%Nl#|)3uqbBV8c)_A9 zwi2ECN7QxkaJDO0JNk{`5!||G_r5#0d4{=v#YHYSEzeXv3c~>t$RLm z!Q&}~1Z60*Q3d7k+!_qvq*8$7YkW2(k>-8xTBD=#ImAnWK`GASU}6si7?yBFBnl+{ z4^Gi%9}WUP*0Gxq59BMJX=ZxKqrvRWSMEvMh z7KmJu!9)y@?{s2%BE(5U+}H?2&P|8hE32-xNJUty1g{!)lXxTQWHDqXBlov#7&b~0$n7x{V-6Vh=Ze*wwU>73kpOV zeAM|jH6Z*6?QV&uYaqG2LJI*1w88>|C=UmZ!M?(PbBae zp3-Pp(geHi$-|d0B_^j3GyX;t8!>P8?xhUfHs10qJ& z$CS$Ssq$d-ls@+V*WOjWMb))?38fiArMnRjq#LCq6r@91K6c`NHfyd)BOV-@m$(g7Wr5g&#Bc~`I%v&9&_y?6|3 zfBu?p;VEVXi{{aRjN9|JvqfS1Le{|)!?kbfJIyjR@*l`ihM5?tJce2z{bcaW@Pid% z=q{+iBH2LD1EMkO%}v=NWIsK;Id33^hl-FRg@zv{b7}RjeU|svW>jMW-3MvNeA{wT z9-mp-62ov3AYoJz-4+H(#IR$zc0eXZT_A2wt|aUmSQH6N4rR%#DqpTGS^-=sGSj=J z(jkhin#Rcl`3_0?m9KPOD3|sGEDILQDZjHMg7lzN=~~&u9&tC-pWTqY?LZq(k^dsu z&akWc)=tHZcxv^V8zvCZn!SrvI|VM&ZF3^SqS@|Xcz%=@v~lWc6`;pX;3kXF7`fo{ zyJ+&Ez9|`N)X`t!h1u?`Hou`JGrqyUP428Jhf-u3&wla)E(9EpcyMo|9t;Nv9c)(K zF5Z^@T2=2uVn12L1iShJloth6^;9A;NUD$$(5yM9^9@9(kpJ&xLP*`W2D+g3U$xtO z5jJObheuU$(q&iE*BciE6jEIhW`WV^{GV^m&>)s$&^)MuvD5_s6B(~Ckqok@Um(8? zHc8GE6f<7^l)=&h$UA8(Z+bZRii*`-G(-YG0zh)dXk7Tbx`jLKh#9jRKylyqrq#%Q zv6tyju=DL2E_!`EyoOJA`Br9C2Nsz#Iee!=#+k=KVmp9Yi52wxE$$G6ZAB=)A|J-fky?aJwW=Edl1fVMvnP)jaeU&_MalG~mn;Pap7L%G-{nB}@k~ z39F{2be0=SmYxJo&!Yp-gL9{{L+w7NY$_p`fgqHSgAcbu*BS7y1R@e_YF&2#SEovu}EAV4*iTUmKzOS0NWE&1@!r0!`FCk#Ot zqI~PnSAYvg(*A#o1D~>$P!JoDiY_MKWCZ*dHs&)Lkra95_}2;8&tF$+&r{O+t3CgF z+(vu($9T^7IB{Q#;HoRK!0yBRu0Z~;fj)YIyu0grYJ;^MyN(NAwZ@ncIRg4i->;Q-=j{)K zI#kh0yhcva{$V1gQAK;-5u2&BgZt~5ecA)s#ab%dP^Qsvv!K*eCDvIf~Kv=~6 z|9fUP9ufdqfG(GByhQgww!PKKU!_lgpPM()B4#VdxogC2(PoIZcja!QW*Ny>;PBr{r3IFr>+hn5CnC4J|vnf^T=o3;v;UG?2qjzcMXsRGQ)^4<_^!)$+pd zfQ$dVL5eaZ_Z#t)uQg=O3nsy^oWT-0qEl}2 zTS1U=(;yQOr)56LNz1y8fyPufhrT^1pUJO2;6j7WbC$?2NmTQ)8zDP${dQ}t-HZ+b zQ8Du=yQsNZWa~p%&1#OQONaESq9|4mP z0jh`s9qPuMZC)xcy*&k@l>$vB=t(F;gx*N@kP;NvaeYGtp)i;dIQzs_XaILFZCCP> z`;~9K2zAVzYH$9UTiPj?gLMXleCq38==iCo6tb@91k+GKg%Wq(i2= zBZtN&Y+vR1?q#m*e6uq9iPd~sgz(1lO7hv}=AQ<+P$s5r=TwrO4rN0tajrM6Lz_+D z=uHMpg&F{1pej)#Q`O$G?8lur4E?|^b#@<_@L9ogF)V?JNqx^RlsOxvu>T z7~Im08wTfHt=Qto%m}MlfPyv@|JN_av-^zxC}U{{6P?vzHLsEcOq!1kHyF-( z*EyhVm&?0RQpH+Q+zC=SzbpLJM4eJX1Z{lRCyHG!4k}?A&CQV2mCJL`;`lqG+n)2i zZ0AW&NjT_S~2$5g+XFfdz^+;r1qgZ|>or;30n8(?n1 zuatlDNAnDo6~I92NK{%L(HMUr8u zp3nE{H~ky%wgT^V|4l6h0ZG(J1QEJ5s%Gaoa#FkI^??zUj8|@a%;6Iq)N^{NJuGo= z#H$R%SmfLlT9KDDPRxBw%e_Z}y#;v<*9JlfbT|3!g+GUr%c0zW9T>zM|j>D14qOEa~Oz9L}XI zk?N_{c3YkjWusR7)u#3fzWo$+Lhd@pHjkw3k64$&1z*{ow=`_q!#twn=J+74sO+|& zXL!zESVPKEz@t4!_$fs;?DLU{gk|Ha)pwE)(`R$)Xv9@z7il%GiPvS(uN~f39nh=e zuMp9C-iye1o+VV=T5wrm1&i=srAIl~E8MzEXmJIe*HGP?&-4M9pBCben8Q7237K+Q zXEbBdK^QS94zwDdgKW0k|2h!8^9>E%VLO|b4JG3@`0Z`#+##w{a?G_pp^Iw46_VA6J3BjHy8F9?vJ+j|AN5MhRRD)9mJ(P5Exd4Zlh&-|Dov zS%3XX9fX4RhRzJ}8u^AFr6;p1HOa5Dvjt1U`DmoOKlD4t+C7u@=U|ajM>?NG+#N~Q z2l-HpF{vMqs>IzrjC8VL8%{qpw+!>uqs(C=Bz_=$$*dUXW9aTG_tUF(sqNsSFS@%2 z0{~#VvD!9^S7A6!6vmmFBR?%{^`cJ_--*HnCz;*;sWRe2tKSXL^60E%hKU6qyyO1E zjePCh_I{2rBdS2FGQ^@XDmc9An9mYfMp7@d9BNn`81VI$S3t~}b1La{hU1Td;lRP7 z?0MfMh8kb?*7A)uDikf+4@$aE%wyF2jlX zdIV*o4_fT%Jm&gIlaxl{vv2t=)7i!NkxwTCndJtq;kg$laOMa5GRn_NS=SUGY7O<4 z_;Id&cARAEs zY}-A~I%;k@XVx6{2AI-9?~9eKX;=i7;B7h3mh+Cry~c+AeI)S~-rdh1wH8j3Ww zxKA5F(a3o`f$Z&f|KJ@rThybuMPlLjQL%T}OZLq7+~VvaOfi)o11mg10tC`3-vrXW z0gay1a#?#oK~+|?P-m9ST1grw-%;49TbN>6cq$j}6CGxFN~hH%wz*Xt)n50Yqiw6$ zA2x_KqztQ5hVc3dnJ03)Yq`2`w-ayk4WX<2r{H;Y{6*j^BNx3_b3gA!8j06iM9{hS zXjsD1!srRq8&BhsM1C_$?B#k?xIRQ#{^4PP@q1k#x^zY{DBoe57r+jfjIo>!%oyX9 zAEfNc?fB3shSAC?hBK8m-$6B|m>qvzPsUWMFpt~TK@!dG-(GtxElyN;I=(S3Eo{e; zDN!!fKPH&6>^a7Wq3kO?N$6kiBRw;pE`s%GoJGn z_j{I66a$yMz&ff({FWl^74!K>p^;be(#+~{KHf})*^CW$qv<36j8|%TaMlw_0!&kj zfbGPd+SOHY|KydgxPlWTlR;e0k8m}LZ&yL5jx2zClr`UNqMxJzdnNv!z4PXS1et%( zL^>R+a7PsZd2CYb3za>NlHE8G#oYcMEG-Nk2BA$N%Jy00qj8j?%rrC8?(UB9(?U7x zR`<@tlyih-*GSZjP#42jVp$Nx3e&)%ReY2nLrbzHZ6n$OQJc?!fTHAbx} z$csxM-}Mj(gdHoB)T#j7^XCroG{1R19zB^^i)cqEt2ex<=6IvvMsNMC-KEM_31#}V z^9R+RAGk|2!sAvK(Z2Q}aW*83HUfOo9O^%_s~IbbvZkmfzSic3^g{7qMUmBRbkgqv z4O;586s5zMVoj?wH%oAYG6KwBtamzVsGgEs>{<>!Gu@%U=VBQAW_`ZNTgXYZRGiPM z&5mcV___;qxU`Wv`JlKZ%GSF+qgIlL-@AfB8j0=!z-3-A7DK1CG zE5y^o>erv>>q+Q!*`+eD-+k(hsF!6$pbOhHQSMp2 zM;mYO!C6{4CtCE)Q_(!oVD7lPE70d;=SMg6KF-K|>mHvku59Wa=ea)LlWAYDF7<_F zE$2RCO*zvgRG4TBsj5tW9Q{0s(@epYG<6DUuYVva{iSZZS68nk;Ocl?oUKqoB^qZR z{jk~bPoKY%ft6sIM#_@g+b)~4U4|G67W_(1QJW*~5Q61#{faAIXF{sAGcrurl)O!(XFt>BVq4lWGTOZf)>J4l`7gvj!KvxAvt!S>S0rh&b<2SR z{35Fz1S#-IK+#Ly0G}#&9D3)SXc^(($F~S5EdE4_;{CHO4|1yA{ME|47P;HwwtL68 zr^hUkAwj4SACz~2q3qK>sJPKYSD!p#_FMZvclxn0>PUBT^|{9S-0a`|@yJ1%59Zg; z9J${;G~RcLn5pj%eP&ywd0)o*NHj%1d-@U_lkG`w3dq{Z z^G%5F^T%hwI`*!xOchpeTAb$GEYxKJ^{pV;4(snK)3XGe5c8!LyPa!_ECuC255&Lq zv}C`GwCcr3@Qz>?k5%i*=IF@6b84Or7ILqhVBH)>SU*ge`4&tvj`wg3f!xG}5h2-A%&uTTz0}=PtPlSEgAI^m`9( z6ypzHg{)}76Vd?W?w#H-hy!(+On~n>NV{7vQqo%|0Oe!*r~XGz8RKzd>7|WYTHozG zxE$+bP-|SXr^6b%|FJMl@5yn^BNoburc)D|4+>j>nX>lV zkNQ@@w)(s7Hhl36RQMqPOxe z{dR08L$d@V@$+zI_ys!&Mej>|iNkF?nmAZsJF`mgd8Y6dGYE)o>xCk@qAJ6L9Xw9- z$T2Vx0>Vl+0UQ|(37gLfeEgy>H);EdFcpeO+g1}$6^~rSL>X}HdW^$`f0XYi1?M~E z(455QpED9UDhIFhiH{G9!xuB!Ga7naZ0+EGsrj034MAKmS^QT@FG$ZwqFE}Exy%k% z6WEE*6C+04v^e#%q7t43JG(eA*8@q(?BWkUdJ=H#;$VYOd2(;@I$**gxE;L$DESb_ zcL2-b0=e;{Lke&Asy81Lwi;X(+sIoC*{k0w+mZ6RAEE}k=2M=EP?$B3plJ}Z+BYJi zDWo4vsUog!KHpHM z(YlJQh5D8C9dEH$ia+7ccHe-SX1lu!?T9If8hn@i!L-4Ih->U4?ZowEfsc@SWJ2aG zFzN5}6F6Z@go*Stkisb=QwF`HWHdNM(_B1*S^mH}<}(2ko%zN4?JdCh;t-N$Q+i{s zoM9ExAKL=PFXN08aG}4ojaAo&<_?c*d~f?G&Y3;mo$GG-Uccl~;}5`HO-yHQi>p+k zu6dx39G&H+X=!K9pnF$+Ph6dQk&Mxo$uo{o)Dli@JMI#@Z58mEADQXz9aR;WNWtLm zyzXw&_Pukzalq!rZ15|7ALESfJ4DEO zW<2vffX=MdA#bNT9?0%Ox^&Rh@!E%FvDkzdyk#1JdxF{|+D<4IsZjMCu@^0fR^PLd z+|S<&S!ZwEfj_3)=eRXSB;bUNI@%>7pC0SbCh(86>dpQK9{wn(=TJ<5XTG}X2Aw6? zq|Zq0*fa1iwhWi4$LA|*m6M7})b|PQNS78NSp5+LvBU=QZ}KX?UJ2&*?9@IAhr9qe zpTbTDZijs{9VhYypz(6K>IK3&kSKb08fnu*%evx@IlFBQqG%8xLC4-$f`_^L4pBy? z6TGzv-aEaO+WV>FrQPFsn5uz$egdVOl^)qKQ%GZ0b$rF)er6VJXHDh`E%eEdi?1@MdZEpzjs$4G$KJ} z&$Bo+;N8Z-ve0ZtCX5D>;3^r^0hjn;H<6`(=N(DmwNPOuehQyEhcr`2N|E%C6&uD7 zIS%kywqY3iFh}e^#Y+c(b}Y2@=HCkqK6ta5T^HqMt6!*2wXoa1{I0fCzwNqMcdx}} zWOBh^+1aNx5Bn*j4fdt3fw7-J;H5Wj%|nys0*cwrl=9^H^3>W{Jyj`)5cn=aM1XTX zhYaNPMyBYtP|6?|-NEz%>VpQM=QJckgU7dmBSX3gD0*tJ;ea1;k;R7lZ_$ar-L2DT z5Q63XQSdkd345OD*~r3w;7#mZaC4P0A9m*OEXS z(aUig6V??H%vtU$AK~tHyWcIuZv?VcFb_fOZouzhL-Denk_k+ak5qu;RsT4Mu2kBF{wCw;9by;V_BMt9s&8!cU=&H?R54eV7Jg^k<%wI9F zuFzvD8O(42;lqb^|n3^u+K_l~2B`MI(E1!Z&Ldw+8Md>HorghDiH#BV=F;4xt-TQd!Z9NYyI@sMlw*#8JX@G$lpqdrnB2exGj6=^<>9$r8k zjnM46YdeMcyEw^+rjo!u%gkyjF}VIUtCHyx4nxP8_xQ*dk*vSOvxr)~PBB-cA8l&Z zLo$y<*(Mn1tr-yP8XE;G;b4c+DBM$^`9WT!k=P7MAu$blHsVy;sV)doZaaJfiTgCh zMaOb1N;N>or){RhwK+CX%-uQhy{IMmfwGhgT57{cF$~|*9TwlTJ`!`On!L^txNXjt z`VtadRp9d|azkhUp7Z&H>HNu&jta>&+MJ$DY6i{pSo-O<(5c*KM1+sGoWz=DgfDK> z*Mu*ppR_inAZ(j2zeT2eR_$%`?td(EdhEU@LZ2oDk(CkX^zp4$zY7Ca)a8iGA8Q^4tU~M<|MP&WWd@3G%%@`=co2eUJpN8 zhJAh$v`t$Sjps+m;>TFf#eVu8`>7mh2kgP+LO0eth2q7;z6iby{kxFjnBU z!mB=SXynPfir{-ZJ6E4bC34Db7PFI>sV7K4BSU;J{f0^T2--aAcPKt~TFYM9Jm5!X z*zWgTImKy>SwiWq?SV$mPDX$d{*!I>x^_gbAEmb&W45)Yky(U|&>2%D9$cqeJz1c5 zx9CwA?+g7^l`0zo-hMKgv7IaFKMFEFv2(9A0;X|9uQIHCX7Q8nyM?xo_*T5f%N{kV z_(q=+BZUs#NR&{|;TW7?B)8q|6c}twbnDJWF4ix4>1Q?L2=1ffp7k5k=B&pN!{-;n zqLU^5mLsHc1@h}wByb2x0Zj=)&!AQj?}^w#8d*sE|F&KtPc>Zine2fJ1XrFhaIlZ{ z1A=1|9AW>MYkp8atWU#U3+td0_Ve7z3tB7S)4L%GF)*yV=~9H=VB^Jte>}DYJM3R6 z2?v`0s7!!RDA)?Hq>?s8vzq_atbi9m;NUtK&F`-N@E3FHq=yN{51^!eNpDR>6F@N_z12{LY literal 0 HcmV?d00001 diff --git a/docs/img/component-status-state-diagram.png b/docs/img/component-status-state-diagram.png new file mode 100644 index 0000000000000000000000000000000000000000..ad9735edfe3423de63b135770bf76e2fd3409088 GIT binary patch literal 83660 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 Date: Fri, 21 Jun 2024 01:56:48 -0400 Subject: [PATCH 100/168] [chore] Commit to Building Collector with latest Go minor version (#10448) Change the collector compatibility promise slightly by committing to building the collector with the latest Go minor version. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d30022a0f3..0f2b361123c 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ Support for Go versions on the OpenTelemetry Collector is updated as follows: 1. The first release after the release of a new Go minor version `N` will add build and tests steps for the new Go minor version. 2. The first release after the release of a new Go minor version `N` will remove support for Go version `N-2`. -Official OpenTelemetry Collector distro binaries may be built with any supported Go version. +Official OpenTelemetry Collector distro binaries will be built with a release in the latest Go minor version series. ## Verifying the images signatures From 426e660499d7bd331f66bb3336daf1932b8a8e4a Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Fri, 21 Jun 2024 09:32:05 +0200 Subject: [PATCH 101/168] [exporter/debug] format log records as one-liners in `normal` verbosity (#10225) #### Description Changes the behavior of `normal` verbosity of the Debug exporter for logs to display each log record in one line of text. Note that if the body of the log record contains newlines, the output will be displayed in multiple lines. This pull request is part of https://github.com/open-telemetry/opentelemetry-collector/issues/7806; it implements the change for logs. The changes for metrics and [traces](https://github.com/open-telemetry/opentelemetry-collector/pull/10280) will be proposed in separate pull requests. The implementation in this pull request does not display any details on the resource or the scope of the logs. I would like to propose displaying the resource and the scope as separate lines in a separate pull request. This change applies to the Debug exporter only. The behavior of the Logging exporter remains unchanged. To use this behavior, switch from the deprecated Logging exporter to Debug exporter. #### Link to tracking issue - https://github.com/open-telemetry/opentelemetry-collector/issues/7806 #### Testing Added unit tests for the formatter. #### Documentation Described the formatting in the Debug exporter's README. --------- Co-authored-by: Roger Coll Co-authored-by: Pablo Baeyens --- .../debug-exporter-normal-verbosity-logs.yaml | 25 ++++ exporter/debugexporter/README.md | 18 ++- exporter/debugexporter/exporter.go | 12 +- .../debugexporter/internal/normal/logs.go | 52 ++++++++ .../internal/normal/logs_test.go | 118 ++++++++++++++++++ 5 files changed, 221 insertions(+), 4 deletions(-) create mode 100644 .chloggen/debug-exporter-normal-verbosity-logs.yaml create mode 100644 exporter/debugexporter/internal/normal/logs.go create mode 100644 exporter/debugexporter/internal/normal/logs_test.go diff --git a/.chloggen/debug-exporter-normal-verbosity-logs.yaml b/.chloggen/debug-exporter-normal-verbosity-logs.yaml new file mode 100644 index 00000000000..d874275a547 --- /dev/null +++ b/.chloggen/debug-exporter-normal-verbosity-logs.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporter/debug + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: In `normal` verbosity, display one line of text for each log record + +# One or more tracking issues or pull requests related to the change +issues: [7806] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/debugexporter/README.md b/exporter/debugexporter/README.md index 344c55c3515..6f8eac92623 100644 --- a/exporter/debugexporter/README.md +++ b/exporter/debugexporter/README.md @@ -62,8 +62,22 @@ Here's an example output: ### Normal verbosity -With `verbosity: normal`, the exporter's behavior is currently the same as with `verbosity: basic`. -See above for more details. +With `verbosity: normal`, the exporter outputs about one line for each telemetry record, including its body and attributes. +The "one line per telemetry record" is not a strict rule. +For example, logs with multiline body will be output as multiple lines. + +> [!IMPORTANT] +> Currently the `normal` verbosity is only implemented for logs. +> Metrics and traces are going to be implemented in the future. +> The current behavior for metrics and traces is the same as in `basic` verbosity. + +Here's an example output: + +```console +2024-05-27T12:46:22.423+0200 info LogsExporter {"kind": "exporter", "data_type": "logs", "name": "debug", "resource logs": 1, "log records": 1} +2024-05-27T12:46:22.423+0200 info the message app=server + {"kind": "exporter", "data_type": "logs", "name": "debug"} +``` ### Detailed verbosity diff --git a/exporter/debugexporter/exporter.go b/exporter/debugexporter/exporter.go index 191ac562563..ab5865e41c7 100644 --- a/exporter/debugexporter/exporter.go +++ b/exporter/debugexporter/exporter.go @@ -13,6 +13,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/config/configtelemetry" + "go.opentelemetry.io/collector/exporter/debugexporter/internal/normal" "go.opentelemetry.io/collector/exporter/internal/otlptext" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -28,10 +29,16 @@ type debugExporter struct { } func newDebugExporter(logger *zap.Logger, verbosity configtelemetry.Level) *debugExporter { + var logsMarshaler plog.Marshaler + if verbosity == configtelemetry.LevelDetailed { + logsMarshaler = otlptext.NewTextLogsMarshaler() + } else { + logsMarshaler = normal.NewNormalLogsMarshaler() + } return &debugExporter{ verbosity: verbosity, logger: logger, - logsMarshaler: otlptext.NewTextLogsMarshaler(), + logsMarshaler: logsMarshaler, metricsMarshaler: otlptext.NewTextMetricsMarshaler(), tracesMarshaler: otlptext.NewTextTracesMarshaler(), } @@ -74,7 +81,8 @@ func (s *debugExporter) pushLogs(_ context.Context, ld plog.Logs) error { s.logger.Info("LogsExporter", zap.Int("resource logs", ld.ResourceLogs().Len()), zap.Int("log records", ld.LogRecordCount())) - if s.verbosity != configtelemetry.LevelDetailed { + + if s.verbosity == configtelemetry.LevelBasic { return nil } diff --git a/exporter/debugexporter/internal/normal/logs.go b/exporter/debugexporter/internal/normal/logs.go new file mode 100644 index 00000000000..9a2ff4cd808 --- /dev/null +++ b/exporter/debugexporter/internal/normal/logs.go @@ -0,0 +1,52 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package normal // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/normal" + +import ( + "bytes" + "fmt" + "strings" + + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/plog" +) + +type normalLogsMarshaler struct{} + +// Ensure normalLogsMarshaller implements interface plog.Marshaler +var _ plog.Marshaler = normalLogsMarshaler{} + +// NewNormalLogsMarshaler returns a plog.Marshaler for normal verbosity. It writes one line of text per log record +func NewNormalLogsMarshaler() plog.Marshaler { + return normalLogsMarshaler{} +} + +func (normalLogsMarshaler) MarshalLogs(ld plog.Logs) ([]byte, error) { + var buffer bytes.Buffer + for i := 0; i < ld.ResourceLogs().Len(); i++ { + resourceLog := ld.ResourceLogs().At(i) + for j := 0; j < resourceLog.ScopeLogs().Len(); j++ { + scopeLog := resourceLog.ScopeLogs().At(j) + for k := 0; k < scopeLog.LogRecords().Len(); k++ { + logRecord := scopeLog.LogRecords().At(k) + logAttributes := writeAttributes(logRecord.Attributes()) + + logString := fmt.Sprintf("%s %s", logRecord.Body().AsString(), strings.Join(logAttributes, " ")) + buffer.WriteString(logString) + buffer.WriteString("\n") + } + } + } + return buffer.Bytes(), nil +} + +// writeAttributes returns a slice of strings in the form "attrKey=attrValue" +func writeAttributes(attributes pcommon.Map) (attributeStrings []string) { + attributes.Range(func(k string, v pcommon.Value) bool { + attribute := fmt.Sprintf("%s=%s", k, v.AsString()) + attributeStrings = append(attributeStrings, attribute) + return true + }) + return attributeStrings +} diff --git a/exporter/debugexporter/internal/normal/logs_test.go b/exporter/debugexporter/internal/normal/logs_test.go new file mode 100644 index 00000000000..8aafa49862a --- /dev/null +++ b/exporter/debugexporter/internal/normal/logs_test.go @@ -0,0 +1,118 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package normal + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/plog" +) + +func TestMarshalLogs(t *testing.T) { + tests := []struct { + name string + input plog.Logs + expected string + }{ + { + name: "empty logs", + input: plog.NewLogs(), + expected: "", + }, + { + name: "one log record", + input: func() plog.Logs { + logs := plog.NewLogs() + logRecord := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() + logRecord.SetTimestamp(pcommon.NewTimestampFromTime(time.Date(2024, 1, 23, 17, 54, 41, 153, time.UTC))) + logRecord.SetSeverityNumber(plog.SeverityNumberInfo) + logRecord.SetSeverityText("INFO") + logRecord.Body().SetStr("Single line log message") + logRecord.Attributes().PutStr("key1", "value1") + logRecord.Attributes().PutStr("key2", "value2") + return logs + }(), + expected: `Single line log message key1=value1 key2=value2 +`, + }, + { + name: "multiline log", + input: func() plog.Logs { + logs := plog.NewLogs() + logRecord := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() + logRecord.SetTimestamp(pcommon.NewTimestampFromTime(time.Date(2024, 1, 23, 17, 54, 41, 153, time.UTC))) + logRecord.SetSeverityNumber(plog.SeverityNumberInfo) + logRecord.SetSeverityText("INFO") + logRecord.Body().SetStr("First line of the log message\n second line of the log message") + logRecord.Attributes().PutStr("key1", "value1") + logRecord.Attributes().PutStr("key2", "value2") + return logs + }(), + expected: `First line of the log message + second line of the log message key1=value1 key2=value2 +`, + }, + { + name: "two log records", + input: func() plog.Logs { + logs := plog.NewLogs() + logRecords := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords() + + logRecord := logRecords.AppendEmpty() + logRecord.SetTimestamp(pcommon.NewTimestampFromTime(time.Date(2024, 1, 23, 17, 54, 41, 153, time.UTC))) + logRecord.SetSeverityNumber(plog.SeverityNumberInfo) + logRecord.SetSeverityText("INFO") + logRecord.Body().SetStr("Single line log message") + logRecord.Attributes().PutStr("key1", "value1") + logRecord.Attributes().PutStr("key2", "value2") + + logRecord = logRecords.AppendEmpty() + logRecord.Body().SetStr("Multi-line\nlog message") + logRecord.Attributes().PutStr("mykey2", "myvalue2") + logRecord.Attributes().PutStr("mykey1", "myvalue1") + return logs + }(), + expected: `Single line log message key1=value1 key2=value2 +Multi-line +log message mykey2=myvalue2 mykey1=myvalue1 +`, + }, + { + name: "log with maps in body and attributes", + input: func() plog.Logs { + logs := plog.NewLogs() + logRecord := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() + logRecord.SetTimestamp(pcommon.NewTimestampFromTime(time.Date(2020, 2, 11, 20, 26, 13, 789, time.UTC))) + logRecord.SetSeverityNumber(plog.SeverityNumberInfo) + logRecord.SetSeverityText("INFO") + body := logRecord.Body().SetEmptyMap() + body.PutStr("app", "CurrencyConverter") + bodyEvent := body.PutEmptyMap("event") + bodyEvent.PutStr("operation", "convert") + bodyEvent.PutStr("result", "success") + conversionAttr := logRecord.Attributes().PutEmptyMap("conversion") + conversionSourceAttr := conversionAttr.PutEmptyMap("source") + conversionSourceAttr.PutStr("currency", "USD") + conversionSourceAttr.PutDouble("amount", 34.22) + conversionDestinationAttr := conversionAttr.PutEmptyMap("destination") + conversionDestinationAttr.PutStr("currency", "EUR") + logRecord.Attributes().PutStr("service", "payments") + return logs + }(), + expected: `{"app":"CurrencyConverter","event":{"operation":"convert","result":"success"}} conversion={"destination":{"currency":"EUR"},"source":{"amount":34.22,"currency":"USD"}} service=payments +`, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + output, err := NewNormalLogsMarshaler().MarshalLogs(tt.input) + assert.NoError(t, err) + assert.Equal(t, tt.expected, string(output)) + }) + } +} From b3c781b90e398c90e616400eac3bab221aed2eeb Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Fri, 21 Jun 2024 05:32:21 -0500 Subject: [PATCH 102/168] [chore] Remove telemetry from graph initialization (#10446) This PR refactors the service graph initialization so that the graph can be assembled without the intention to start it. 1. Do not save telemetry on the graph. The only use of this was for reporting component status. Instead, pass in a reporter when starting or stopping. Correspondingly, add an internal `statustest` package to make it easy to pass in a status reporter in tests. 2. Decouple graph building from extension building. There isn't any direct relationship so these things should be separated. --- service/internal/graph/graph.go | 18 ++++---- service/internal/graph/graph_test.go | 37 ++++++++-------- .../servicetelemetry/telemetry_settings.go | 2 +- service/internal/status/status.go | 20 ++++++--- .../internal/status/statustest/statustest.go | 21 +++++++++ .../status/statustest/statustest_test.go | 13 ++++++ service/service.go | 44 +++++++++++-------- 7 files changed, 101 insertions(+), 54 deletions(-) create mode 100644 service/internal/status/statustest/statustest.go create mode 100644 service/internal/status/statustest/statustest_test.go diff --git a/service/internal/graph/graph.go b/service/internal/graph/graph.go index c95d1f54b7e..cbf7e8538c5 100644 --- a/service/internal/graph/graph.go +++ b/service/internal/graph/graph.go @@ -32,6 +32,7 @@ import ( "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/service/internal/capabilityconsumer" "go.opentelemetry.io/collector/service/internal/servicetelemetry" + "go.opentelemetry.io/collector/service/internal/status" "go.opentelemetry.io/collector/service/pipelines" ) @@ -69,7 +70,6 @@ func Build(ctx context.Context, set Settings) (*Graph, error) { componentGraph: simple.NewDirectedGraph(), pipelines: make(map[component.ID]*pipelineNodes, len(set.PipelineConfigs)), instanceIDs: make(map[int64]*component.InstanceID), - telemetry: set.Telemetry, } for pipelineID := range set.PipelineConfigs { pipelines.pipelines[pipelineID] = &pipelineNodes{ @@ -394,7 +394,7 @@ type pipelineNodes struct { exporters map[int64]graph.Node } -func (g *Graph) StartAll(ctx context.Context, host component.Host) error { +func (g *Graph) StartAll(ctx context.Context, host component.Host, reporter status.Reporter) error { nodes, err := topo.Sort(g.componentGraph) if err != nil { return err @@ -413,25 +413,25 @@ func (g *Graph) StartAll(ctx context.Context, host component.Host) error { } instanceID := g.instanceIDs[node.ID()] - g.telemetry.Status.ReportStatus( + reporter.ReportStatus( instanceID, component.NewStatusEvent(component.StatusStarting), ) if compErr := comp.Start(ctx, host); compErr != nil { - g.telemetry.Status.ReportStatus( + reporter.ReportStatus( instanceID, component.NewPermanentErrorEvent(compErr), ) return compErr } - g.telemetry.Status.ReportOKIfStarting(instanceID) + reporter.ReportOKIfStarting(instanceID) } return nil } -func (g *Graph) ShutdownAll(ctx context.Context) error { +func (g *Graph) ShutdownAll(ctx context.Context, reporter status.Reporter) error { nodes, err := topo.Sort(g.componentGraph) if err != nil { return err @@ -452,21 +452,21 @@ func (g *Graph) ShutdownAll(ctx context.Context) error { } instanceID := g.instanceIDs[node.ID()] - g.telemetry.Status.ReportStatus( + reporter.ReportStatus( instanceID, component.NewStatusEvent(component.StatusStopping), ) if compErr := comp.Shutdown(ctx); compErr != nil { errs = multierr.Append(errs, compErr) - g.telemetry.Status.ReportStatus( + reporter.ReportStatus( instanceID, component.NewPermanentErrorEvent(compErr), ) continue } - g.telemetry.Status.ReportStatus( + reporter.ReportStatus( instanceID, component.NewStatusEvent(component.StatusStopped), ) diff --git a/service/internal/graph/graph_test.go b/service/internal/graph/graph_test.go index 575f93cab89..68ba9f04bed 100644 --- a/service/internal/graph/graph_test.go +++ b/service/internal/graph/graph_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/service/internal/servicetelemetry" "go.opentelemetry.io/collector/service/internal/status" + "go.opentelemetry.io/collector/service/internal/status/statustest" "go.opentelemetry.io/collector/service/internal/testcomponents" "go.opentelemetry.io/collector/service/pipelines" ) @@ -154,13 +155,13 @@ func TestGraphStartStop(t *testing.T) { pg.componentGraph.SetEdge(simple.Edge{F: f, T: t}) } - require.NoError(t, pg.StartAll(ctx, componenttest.NewNopHost())) + require.NoError(t, pg.StartAll(ctx, componenttest.NewNopHost(), statustest.NewNopStatusReporter())) for _, edge := range tt.edges { assert.Greater(t, ctx.order[edge[0]], ctx.order[edge[1]]) } ctx.order = map[component.ID]int{} - require.NoError(t, pg.ShutdownAll(ctx)) + require.NoError(t, pg.ShutdownAll(ctx, statustest.NewNopStatusReporter())) for _, edge := range tt.edges { assert.Less(t, ctx.order[edge[0]], ctx.order[edge[1]]) } @@ -188,11 +189,11 @@ func TestGraphStartStopCycle(t *testing.T) { pg.componentGraph.SetEdge(simple.Edge{F: c1, T: e1}) pg.componentGraph.SetEdge(simple.Edge{F: c1, T: p1}) // loop back - err := pg.StartAll(context.Background(), componenttest.NewNopHost()) + err := pg.StartAll(context.Background(), componenttest.NewNopHost(), statustest.NewNopStatusReporter()) assert.Error(t, err) assert.Contains(t, err.Error(), `topo: no topological ordering: cyclic components`) - err = pg.ShutdownAll(context.Background()) + err = pg.ShutdownAll(context.Background(), statustest.NewNopStatusReporter()) assert.Error(t, err) assert.Contains(t, err.Error(), `topo: no topological ordering: cyclic components`) } @@ -216,8 +217,8 @@ func TestGraphStartStopComponentError(t *testing.T) { F: r1, T: e1, }) - assert.EqualError(t, pg.StartAll(context.Background(), componenttest.NewNopHost()), "foo") - assert.EqualError(t, pg.ShutdownAll(context.Background()), "bar") + assert.EqualError(t, pg.StartAll(context.Background(), componenttest.NewNopHost(), statustest.NewNopStatusReporter()), "foo") + assert.EqualError(t, pg.ShutdownAll(context.Background(), statustest.NewNopStatusReporter()), "bar") } func TestConnectorPipelinesGraph(t *testing.T) { @@ -768,7 +769,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { assert.Equal(t, len(test.pipelineConfigs), len(pg.pipelines)) - assert.NoError(t, pg.StartAll(context.Background(), componenttest.NewNopHost())) + assert.NoError(t, pg.StartAll(context.Background(), componenttest.NewNopHost(), statustest.NewNopStatusReporter())) mutatingPipelines := make(map[component.ID]bool, len(test.pipelineConfigs)) @@ -892,7 +893,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { } // Shut down the entire component graph - assert.NoError(t, pg.ShutdownAll(context.Background())) + assert.NoError(t, pg.ShutdownAll(context.Background(), statustest.NewNopStatusReporter())) // Check each pipeline individually, ensuring that all components are stopped. for pipelineID := range test.pipelineConfigs { @@ -2148,8 +2149,8 @@ func TestGraphFailToStartAndShutdown(t *testing.T) { } pipelines, err := Build(context.Background(), set) assert.NoError(t, err) - assert.Error(t, pipelines.StartAll(context.Background(), componenttest.NewNopHost())) - assert.Error(t, pipelines.ShutdownAll(context.Background())) + assert.Error(t, pipelines.StartAll(context.Background(), componenttest.NewNopHost(), statustest.NewNopStatusReporter())) + assert.Error(t, pipelines.ShutdownAll(context.Background(), statustest.NewNopStatusReporter())) }) t.Run(dt.String()+"/processor", func(t *testing.T) { @@ -2162,8 +2163,8 @@ func TestGraphFailToStartAndShutdown(t *testing.T) { } pipelines, err := Build(context.Background(), set) assert.NoError(t, err) - assert.Error(t, pipelines.StartAll(context.Background(), componenttest.NewNopHost())) - assert.Error(t, pipelines.ShutdownAll(context.Background())) + assert.Error(t, pipelines.StartAll(context.Background(), componenttest.NewNopHost(), statustest.NewNopStatusReporter())) + assert.Error(t, pipelines.ShutdownAll(context.Background(), statustest.NewNopStatusReporter())) }) t.Run(dt.String()+"/exporter", func(t *testing.T) { @@ -2176,8 +2177,8 @@ func TestGraphFailToStartAndShutdown(t *testing.T) { } pipelines, err := Build(context.Background(), set) assert.NoError(t, err) - assert.Error(t, pipelines.StartAll(context.Background(), componenttest.NewNopHost())) - assert.Error(t, pipelines.ShutdownAll(context.Background())) + assert.Error(t, pipelines.StartAll(context.Background(), componenttest.NewNopHost(), statustest.NewNopStatusReporter())) + assert.Error(t, pipelines.ShutdownAll(context.Background(), statustest.NewNopStatusReporter())) }) for _, dt2 := range dataTypes { @@ -2196,8 +2197,8 @@ func TestGraphFailToStartAndShutdown(t *testing.T) { } pipelines, err := Build(context.Background(), set) assert.NoError(t, err) - assert.Error(t, pipelines.StartAll(context.Background(), componenttest.NewNopHost())) - assert.Error(t, pipelines.ShutdownAll(context.Background())) + assert.Error(t, pipelines.StartAll(context.Background(), componenttest.NewNopHost(), statustest.NewNopStatusReporter())) + assert.Error(t, pipelines.ShutdownAll(context.Background(), statustest.NewNopStatusReporter())) }) } } @@ -2350,8 +2351,8 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { } pg.componentGraph.SetEdge(simple.Edge{F: e0, T: e1}) - assert.Equal(t, tc.startupErr, pg.StartAll(context.Background(), componenttest.NewNopHost())) - assert.Equal(t, tc.shutdownErr, pg.ShutdownAll(context.Background())) + assert.Equal(t, tc.startupErr, pg.StartAll(context.Background(), componenttest.NewNopHost(), rep)) + assert.Equal(t, tc.shutdownErr, pg.ShutdownAll(context.Background(), rep)) assertEqualStatuses(t, tc.expectedStatuses, actualStatuses) }) } diff --git a/service/internal/servicetelemetry/telemetry_settings.go b/service/internal/servicetelemetry/telemetry_settings.go index 55c6b9f3962..55da9bcf0c2 100644 --- a/service/internal/servicetelemetry/telemetry_settings.go +++ b/service/internal/servicetelemetry/telemetry_settings.go @@ -37,7 +37,7 @@ type TelemetrySettings struct { // Status contains a Reporter that allows the service to report status on behalf of a // component. - Status *status.Reporter + Status status.Reporter } // ToComponentTelemetrySettings returns a TelemetrySettings for a specific component derived from diff --git a/service/internal/status/status.go b/service/internal/status/status.go index e1d524906e5..fecae051d13 100644 --- a/service/internal/status/status.go +++ b/service/internal/status/status.go @@ -96,7 +96,13 @@ type ServiceStatusFunc func(*component.InstanceID, *component.StatusEvent) var ErrStatusNotReady = errors.New("report component status is not ready until service start") // Reporter handles component status reporting -type Reporter struct { +type Reporter interface { + Ready() + ReportStatus(id *component.InstanceID, ev *component.StatusEvent) + ReportOKIfStarting(id *component.InstanceID) +} + +type reporter struct { mu sync.Mutex ready bool fsmMap map[*component.InstanceID]*fsm @@ -106,8 +112,8 @@ type Reporter struct { // NewReporter returns a reporter that will invoke the NotifyStatusFunc when a component's status // has changed. -func NewReporter(onStatusChange NotifyStatusFunc, onInvalidTransition InvalidTransitionFunc) *Reporter { - return &Reporter{ +func NewReporter(onStatusChange NotifyStatusFunc, onInvalidTransition InvalidTransitionFunc) Reporter { + return &reporter{ fsmMap: make(map[*component.InstanceID]*fsm), onStatusChange: onStatusChange, onInvalidTransition: onInvalidTransition, @@ -115,14 +121,14 @@ func NewReporter(onStatusChange NotifyStatusFunc, onInvalidTransition InvalidTra } // Ready enables status reporting -func (r *Reporter) Ready() { +func (r *reporter) Ready() { r.mu.Lock() defer r.mu.Unlock() r.ready = true } // ReportStatus reports status for the given InstanceID -func (r *Reporter) ReportStatus( +func (r *reporter) ReportStatus( id *component.InstanceID, ev *component.StatusEvent, ) { @@ -137,7 +143,7 @@ func (r *Reporter) ReportStatus( } } -func (r *Reporter) ReportOKIfStarting(id *component.InstanceID) { +func (r *reporter) ReportOKIfStarting(id *component.InstanceID) { r.mu.Lock() defer r.mu.Unlock() if !r.ready { @@ -152,7 +158,7 @@ func (r *Reporter) ReportOKIfStarting(id *component.InstanceID) { } // Note: a lock must be acquired before calling this method. -func (r *Reporter) componentFSM(id *component.InstanceID) *fsm { +func (r *reporter) componentFSM(id *component.InstanceID) *fsm { fsm, ok := r.fsmMap[id] if !ok { fsm = newFSM(func(ev *component.StatusEvent) { r.onStatusChange(id, ev) }) diff --git a/service/internal/status/statustest/statustest.go b/service/internal/status/statustest/statustest.go new file mode 100644 index 00000000000..3ba40a16298 --- /dev/null +++ b/service/internal/status/statustest/statustest.go @@ -0,0 +1,21 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package statustest // import "go.opentelemetry.io/collector/service/internal/status/statustest" + +import ( + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/service/internal/status" +) + +func NewNopStatusReporter() status.Reporter { + return &nopStatusReporter{} +} + +type nopStatusReporter struct{} + +func (r *nopStatusReporter) Ready() {} + +func (r *nopStatusReporter) ReportStatus(*component.InstanceID, *component.StatusEvent) {} + +func (r *nopStatusReporter) ReportOKIfStarting(*component.InstanceID) {} diff --git a/service/internal/status/statustest/statustest_test.go b/service/internal/status/statustest/statustest_test.go new file mode 100644 index 00000000000..5c1d4a4d303 --- /dev/null +++ b/service/internal/status/statustest/statustest_test.go @@ -0,0 +1,13 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package statustest // import "go.opentelemetry.io/collector/service/internal/status/statustest" + +import "testing" + +func TestNopStatusReporter(*testing.T) { + nop := NewNopStatusReporter() + nop.Ready() + nop.ReportOKIfStarting(nil) + nop.ReportStatus(nil, nil) +} diff --git a/service/service.go b/service/service.go index eb320cfec2c..775aa7d7238 100644 --- a/service/service.go +++ b/service/service.go @@ -141,13 +141,24 @@ func New(ctx context.Context, set Settings, cfg Config) (*Service, error) { }), } + if err = srv.initGraph(ctx, set, cfg); err != nil { + err = multierr.Append(err, srv.shutdownTelemetry(ctx)) + return nil, err + } + // process the configuration and initialize the pipeline - if err = srv.initExtensionsAndPipeline(ctx, set, cfg); err != nil { - // If pipeline initialization fails then shut down telemetry + if err = srv.initExtensions(ctx, cfg.Extensions); err != nil { err = multierr.Append(err, srv.shutdownTelemetry(ctx)) return nil, err } + if cfg.Telemetry.Metrics.Level != configtelemetry.LevelNone && cfg.Telemetry.Metrics.Address != "" { + // The process telemetry initialization requires the ballast size, which is available after the extensions are initialized. + if err = proctelemetry.RegisterProcessMetrics(srv.telemetrySettings, getBallastSize(srv.host)); err != nil { + return nil, fmt.Errorf("failed to register process metrics: %w", err) + } + } + return srv, nil } @@ -197,7 +208,7 @@ func (srv *Service) Start(ctx context.Context) error { } } - if err := srv.host.pipelines.StartAll(ctx, srv.host); err != nil { + if err := srv.host.pipelines.StartAll(ctx, srv.host, srv.telemetrySettings.Status); err != nil { return fmt.Errorf("cannot start pipelines: %w", err) } @@ -248,7 +259,7 @@ func (srv *Service) Shutdown(ctx context.Context) error { errs = multierr.Append(errs, fmt.Errorf("failed to notify that pipeline is not ready: %w", err)) } - if err := srv.host.pipelines.ShutdownAll(ctx); err != nil { + if err := srv.host.pipelines.ShutdownAll(ctx, srv.telemetrySettings.Status); err != nil { errs = multierr.Append(errs, fmt.Errorf("failed to shutdown pipelines: %w", err)) } @@ -263,19 +274,24 @@ func (srv *Service) Shutdown(ctx context.Context) error { return errs } -// Creates extensions and then builds the pipeline graph. -func (srv *Service) initExtensionsAndPipeline(ctx context.Context, set Settings, cfg Config) error { +// Creates extensions. +func (srv *Service) initExtensions(ctx context.Context, cfg extensions.Config) error { var err error extensionsSettings := extensions.Settings{ Telemetry: srv.telemetrySettings, BuildInfo: srv.buildInfo, Extensions: srv.host.extensions, } - if srv.host.serviceExtensions, err = extensions.New(ctx, extensionsSettings, cfg.Extensions); err != nil { + if srv.host.serviceExtensions, err = extensions.New(ctx, extensionsSettings, cfg); err != nil { return fmt.Errorf("failed to build extensions: %w", err) } + return nil +} - pSet := graph.Settings{ +// Creates the pipeline graph. +func (srv *Service) initGraph(ctx context.Context, set Settings, cfg Config) error { + var err error + if srv.host.pipelines, err = graph.Build(ctx, graph.Settings{ Telemetry: srv.telemetrySettings, BuildInfo: srv.buildInfo, ReceiverBuilder: set.Receivers, @@ -283,19 +299,9 @@ func (srv *Service) initExtensionsAndPipeline(ctx context.Context, set Settings, ExporterBuilder: set.Exporters, ConnectorBuilder: set.Connectors, PipelineConfigs: cfg.Pipelines, - } - - if srv.host.pipelines, err = graph.Build(ctx, pSet); err != nil { + }); err != nil { return fmt.Errorf("failed to build pipelines: %w", err) } - - if cfg.Telemetry.Metrics.Level != configtelemetry.LevelNone && cfg.Telemetry.Metrics.Address != "" { - // The process telemetry initialization requires the ballast size, which is available after the extensions are initialized. - if err = proctelemetry.RegisterProcessMetrics(srv.telemetrySettings, getBallastSize(srv.host)); err != nil { - return fmt.Errorf("failed to register process metrics: %w", err) - } - } - return nil } From 6c2108d0392604475c1b168c82b6a2910cefe461 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 21 Jun 2024 11:52:19 -0600 Subject: [PATCH 103/168] [otelcoltest] Move otelcoltest to its own module (#10417) #### Description As part of https://github.com/open-telemetry/opentelemetry-collector/issues/10290, move `otelcoltest` to its own module. #### Link to tracking issue Related to https://github.com/open-telemetry/opentelemetry-collector/issues/10290 --------- Co-authored-by: Pablo Baeyens --- .chloggen/move-otelcoltest-2.yaml | 25 +++ .chloggen/move-otelcoltest.yaml | 25 +++ Makefile | 2 + otelcol/otelcoltest/Makefile | 1 + otelcol/otelcoltest/config.go | 27 ++- otelcol/otelcoltest/config_test.go | 37 +--- otelcol/otelcoltest/go.mod | 161 +++++++++++++++++ otelcol/otelcoltest/go.sum | 278 +++++++++++++++++++++++++++++ versions.yaml | 1 + 9 files changed, 506 insertions(+), 51 deletions(-) create mode 100644 .chloggen/move-otelcoltest-2.yaml create mode 100644 .chloggen/move-otelcoltest.yaml create mode 100644 otelcol/otelcoltest/Makefile create mode 100644 otelcol/otelcoltest/go.mod create mode 100644 otelcol/otelcoltest/go.sum diff --git a/.chloggen/move-otelcoltest-2.yaml b/.chloggen/move-otelcoltest-2.yaml new file mode 100644 index 00000000000..afcd0737569 --- /dev/null +++ b/.chloggen/move-otelcoltest-2.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: new_component + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcoltest + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Split off go.opentelemetry.io/collector/otelcol/otelcoltest into its own module + +# One or more tracking issues or pull requests related to the change +issues: [10417] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/.chloggen/move-otelcoltest.yaml b/.chloggen/move-otelcoltest.yaml new file mode 100644 index 00000000000..996bb6c61c5 --- /dev/null +++ b/.chloggen/move-otelcoltest.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcoltest + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecates `LoadConfigWithSettings` and `LoadConfigAndValidateWithSettings`. Use `LoadConfig` and `LoadConfigAndValidate` instead. + +# One or more tracking issues or pull requests related to the change +issues: [10417] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/Makefile b/Makefile index e38507fffbb..067da69bd5d 100644 --- a/Makefile +++ b/Makefile @@ -281,6 +281,7 @@ check-contrib: -replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension \ -replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate \ -replace go.opentelemetry.io/collector/otelcol=$(CURDIR)/otelcol \ + -replace go.opentelemetry.io/collector/otelcol/otelcoltest=$(CURDIR)/otelcol/otelcoltest \ -replace go.opentelemetry.io/collector/pdata=$(CURDIR)/pdata \ -replace go.opentelemetry.io/collector/pdata/testdata=$(CURDIR)/pdata/testdata \ -replace go.opentelemetry.io/collector/processor=$(CURDIR)/processor \ @@ -337,6 +338,7 @@ restore-contrib: -dropreplace go.opentelemetry.io/collector/extension/zpagesextension \ -dropreplace go.opentelemetry.io/collector/featuregate \ -dropreplace go.opentelemetry.io/collector/otelcol \ + -dropreplace go.opentelemetry.io/collector/otelcol/otelcoltest \ -dropreplace go.opentelemetry.io/collector/pdata \ -dropreplace go.opentelemetry.io/collector/pdata/testdata \ -dropreplace go.opentelemetry.io/collector/processor \ diff --git a/otelcol/otelcoltest/Makefile b/otelcol/otelcoltest/Makefile new file mode 100644 index 00000000000..ded7a36092d --- /dev/null +++ b/otelcol/otelcoltest/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/otelcol/otelcoltest/config.go b/otelcol/otelcoltest/config.go index 2e1ec6688db..cbc0be024f4 100644 --- a/otelcol/otelcoltest/config.go +++ b/otelcol/otelcoltest/config.go @@ -16,6 +16,8 @@ import ( ) // LoadConfigWithSettings loads a config.Config from the provider settings, and does NOT validate the configuration. +// +// Deprecated: [v0.104.0] Use LoadConfig instead func LoadConfigWithSettings(factories otelcol.Factories, set otelcol.ConfigProviderSettings) (*otelcol.Config, error) { // Read yaml config from file provider, err := otelcol.NewConfigProvider(set) @@ -26,10 +28,8 @@ func LoadConfigWithSettings(factories otelcol.Factories, set otelcol.ConfigProvi } // LoadConfig loads a config.Config from file, and does NOT validate the configuration. -// -// Deprecated: [v0.103.0] use LoadConfigWithSettings instead func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config, error) { - return LoadConfigWithSettings(factories, otelcol.ConfigProviderSettings{ + provider, err := otelcol.NewConfigProvider(otelcol.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ URIs: []string{fileName}, ProviderFactories: []confmap.ProviderFactory{ @@ -41,9 +41,15 @@ func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config, ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, }, }) + if err != nil { + return nil, err + } + return provider.Get(context.Background(), factories) } // LoadConfigAndValidateWithSettings loads a config from the provider settings, and validates the configuration. +// +// Deprecated: [v0.104.0] Use LoadConfigAndValidate instead func LoadConfigAndValidateWithSettings(factories otelcol.Factories, set otelcol.ConfigProviderSettings) (*otelcol.Config, error) { cfg, err := LoadConfigWithSettings(factories, set) if err != nil { @@ -53,21 +59,8 @@ func LoadConfigAndValidateWithSettings(factories otelcol.Factories, set otelcol. } // LoadConfigAndValidate loads a config from the file, and validates the configuration. -// -// Deprecated: [v0.103.0] Use LoadConfigAndValidateWithSettings instead func LoadConfigAndValidate(fileName string, factories otelcol.Factories) (*otelcol.Config, error) { - cfg, err := LoadConfigWithSettings(factories, otelcol.ConfigProviderSettings{ - ResolverSettings: confmap.ResolverSettings{ - URIs: []string{fileName}, - ProviderFactories: []confmap.ProviderFactory{ - fileprovider.NewFactory(), - envprovider.NewFactory(), - yamlprovider.NewFactory(), - httpprovider.NewFactory(), - }, - ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, - }, - }) + cfg, err := LoadConfig(fileName, factories) if err != nil { return nil, err } diff --git a/otelcol/otelcoltest/config_test.go b/otelcol/otelcoltest/config_test.go index c9b0eef14f6..71502de536e 100644 --- a/otelcol/otelcoltest/config_test.go +++ b/otelcol/otelcoltest/config_test.go @@ -11,13 +11,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/converter/expandconverter" - "go.opentelemetry.io/collector/confmap/provider/envprovider" - "go.opentelemetry.io/collector/confmap/provider/fileprovider" - "go.opentelemetry.io/collector/confmap/provider/httpprovider" - "go.opentelemetry.io/collector/confmap/provider/yamlprovider" - "go.opentelemetry.io/collector/otelcol" "go.opentelemetry.io/collector/service/pipelines" ) @@ -25,18 +18,7 @@ func TestLoadConfig(t *testing.T) { factories, err := NopFactories() assert.NoError(t, err) - cfg, err := LoadConfigWithSettings(factories, otelcol.ConfigProviderSettings{ - ResolverSettings: confmap.ResolverSettings{ - URIs: []string{filepath.Join("testdata", "config.yaml")}, - ProviderFactories: []confmap.ProviderFactory{ - fileprovider.NewFactory(), - envprovider.NewFactory(), - yamlprovider.NewFactory(), - httpprovider.NewFactory(), - }, - ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, - }, - }) + cfg, err := LoadConfig(filepath.Join("testdata", "config.yaml"), factories) require.NoError(t, err) // Verify extensions. @@ -81,23 +63,10 @@ func TestLoadConfigAndValidate(t *testing.T) { factories, err := NopFactories() assert.NoError(t, err) - set := otelcol.ConfigProviderSettings{ - ResolverSettings: confmap.ResolverSettings{ - URIs: []string{filepath.Join("testdata", "config.yaml")}, - ProviderFactories: []confmap.ProviderFactory{ - fileprovider.NewFactory(), - envprovider.NewFactory(), - yamlprovider.NewFactory(), - httpprovider.NewFactory(), - }, - ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, - }, - } - - cfgValidate, errValidate := LoadConfigAndValidateWithSettings(factories, set) + cfgValidate, errValidate := LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) require.NoError(t, errValidate) - cfg, errLoad := LoadConfigWithSettings(factories, set) + cfg, errLoad := LoadConfig(filepath.Join("testdata", "config.yaml"), factories) require.NoError(t, errLoad) assert.Equal(t, cfg, cfgValidate) diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod new file mode 100644 index 00000000000..1a415596200 --- /dev/null +++ b/otelcol/otelcoltest/go.mod @@ -0,0 +1,161 @@ +module go.opentelemetry.io/collector/otelcol/otelcoltest + +go 1.21.0 + +require ( + github.com/stretchr/testify v1.9.0 + go.opentelemetry.io/collector/component v0.103.0 + go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.103.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 + go.opentelemetry.io/collector/connector v0.103.0 + go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector/otelcol v0.103.0 + go.opentelemetry.io/collector/processor v0.103.0 + go.opentelemetry.io/collector/receiver v0.103.0 + go.opentelemetry.io/collector/service v0.103.0 + go.uber.org/goleak v1.3.0 +) + +require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + 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.1.1 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.54.0 // indirect + github.com/prometheus/procfs v0.15.0 // indirect + github.com/shirou/gopsutil/v4 v4.24.5 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect + github.com/spf13/cobra v1.8.1 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + github.com/tklauser/numcpus v0.6.1 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 // indirect + go.opentelemetry.io/collector/consumer v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.103.0 // indirect + go.opentelemetry.io/collector/semconv v0.103.0 // indirect + go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect + go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.27.0 // indirect + go.opentelemetry.io/otel/sdk v1.27.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect + go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect + google.golang.org/grpc v1.64.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp + +replace go.opentelemetry.io/collector/receiver => ../../receiver + +replace go.opentelemetry.io/collector/consumer => ../../consumer + +replace go.opentelemetry.io/collector/config/configauth => ../../config/configauth + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + +replace go.opentelemetry.io/collector/confmap/provider/httpprovider => ../../confmap/provider/httpprovider + +replace go.opentelemetry.io/collector/otelcol => ../ + +replace go.opentelemetry.io/collector/confmap/provider/yamlprovider => ../../confmap/provider/yamlprovider + +replace go.opentelemetry.io/collector/confmap/converter/expandconverter => ../../confmap/converter/expandconverter + +replace go.opentelemetry.io/collector => ../.. + +replace go.opentelemetry.io/collector/service => ../../service + +replace go.opentelemetry.io/collector/featuregate => ../../featuregate + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/config/internal => ../../config/internal + +replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/processor => ../../processor + +replace go.opentelemetry.io/collector/confmap => ../../confmap + +replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata + +replace go.opentelemetry.io/collector/pdata => ../../pdata + +replace go.opentelemetry.io/collector/confmap/provider/httpsprovider => ../../confmap/provider/httpsprovider + +replace go.opentelemetry.io/collector/connector => ../../connector + +replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry + +replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque + +replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension + +replace go.opentelemetry.io/collector/confmap/provider/fileprovider => ../../confmap/provider/fileprovider + +replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../confmap/provider/envprovider + +replace go.opentelemetry.io/collector/component => ../../component + +replace go.opentelemetry.io/collector/extension => ../../extension + +replace go.opentelemetry.io/collector/exporter => ../../exporter + +replace go.opentelemetry.io/collector/semconv => ../../semconv + +replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum new file mode 100644 index 00000000000..f1d6ea68a95 --- /dev/null +++ b/otelcol/otelcoltest/go.sum @@ -0,0 +1,278 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= +github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= +github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= +github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +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/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +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= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= +github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= +github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= +github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +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.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= +go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= +go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= +go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= +go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= +go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= +go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= +go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel/bridge/opencensus v1.27.0 h1:ao9aGGHd+G4YfjBpGs6vbkvt5hoC67STlJA9fCnOAcs= +go.opentelemetry.io/otel/bridge/opencensus v1.27.0/go.mod h1:uRvWtAAXzyVOST0WMPX5JHGBaAvBws+2F8PcC5gMnTk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= +go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= +go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= +go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= +go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= +go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= +go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= +go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= +go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= +go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +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= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/versions.yaml b/versions.yaml index 8545cbde46f..0b4ee0826ff 100644 --- a/versions.yaml +++ b/versions.yaml @@ -46,6 +46,7 @@ module-sets: - go.opentelemetry.io/collector/extension/zpagesextension - go.opentelemetry.io/collector/extension/memorylimiterextension - go.opentelemetry.io/collector/otelcol + - go.opentelemetry.io/collector/otelcol/otelcoltest - go.opentelemetry.io/collector/pdata/pprofile - go.opentelemetry.io/collector/pdata/testdata - go.opentelemetry.io/collector/processor From ba22562fd3dd6c4fe2785df09076f2f79e0b70c3 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Sat, 22 Jun 2024 21:16:30 -0700 Subject: [PATCH 104/168] [chore] Assign k8s distribution to components in documentation (#10459) --- cmd/mdatagen/statusdata.go | 1 + connector/forwardconnector/README.md | 3 ++- connector/forwardconnector/metadata.yaml | 2 +- exporter/debugexporter/README.md | 3 ++- exporter/debugexporter/metadata.yaml | 2 +- exporter/nopexporter/README.md | 3 ++- exporter/nopexporter/metadata.yaml | 2 +- exporter/otlpexporter/README.md | 3 ++- exporter/otlpexporter/metadata.yaml | 2 +- exporter/otlphttpexporter/README.md | 3 ++- exporter/otlphttpexporter/metadata.yaml | 2 +- extension/zpagesextension/README.md | 3 ++- extension/zpagesextension/metadata.yaml | 2 +- processor/batchprocessor/README.md | 3 ++- processor/batchprocessor/metadata.yaml | 2 +- processor/memorylimiterprocessor/README.md | 3 ++- processor/memorylimiterprocessor/metadata.yaml | 2 +- receiver/otlpreceiver/README.md | 3 ++- receiver/otlpreceiver/metadata.yaml | 2 +- 19 files changed, 28 insertions(+), 18 deletions(-) diff --git a/cmd/mdatagen/statusdata.go b/cmd/mdatagen/statusdata.go index db130aaf3ea..f09c68f98e9 100644 --- a/cmd/mdatagen/statusdata.go +++ b/cmd/mdatagen/statusdata.go @@ -19,6 +19,7 @@ import ( var distros = map[string]string{ "core": "https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol", "contrib": "https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib", + "k8s": "https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s", } type Codeowners struct { diff --git a/connector/forwardconnector/README.md b/connector/forwardconnector/README.md index fad3289c1e2..acbf15eba18 100644 --- a/connector/forwardconnector/README.md +++ b/connector/forwardconnector/README.md @@ -3,12 +3,13 @@ | Status | | | ------------- |-----------| -| Distributions | [core], [contrib] | +| Distributions | [core], [contrib], [k8s] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fforward%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Fforward) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fforward%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Fforward) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s ## Supported Pipeline Types diff --git a/connector/forwardconnector/metadata.yaml b/connector/forwardconnector/metadata.yaml index 41fc2707019..b3ea1d24c0a 100644 --- a/connector/forwardconnector/metadata.yaml +++ b/connector/forwardconnector/metadata.yaml @@ -4,4 +4,4 @@ status: class: connector stability: beta: [traces_to_traces, metrics_to_metrics, logs_to_logs] - distributions: [core, contrib] + distributions: [core, contrib, k8s] diff --git a/exporter/debugexporter/README.md b/exporter/debugexporter/README.md index 6f8eac92623..9746c7a1658 100644 --- a/exporter/debugexporter/README.md +++ b/exporter/debugexporter/README.md @@ -4,13 +4,14 @@ | Status | | | ------------- |-----------| | Stability | [development]: traces, metrics, logs | -| Distributions | [core], [contrib] | +| Distributions | [core], [contrib], [k8s] | | Warnings | [Unstable Output Format](#warnings) | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Fdebug%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aexporter%2Fdebug) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Fdebug%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aexporter%2Fdebug) | [development]: https://github.com/open-telemetry/opentelemetry-collector#development [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s Exports data to the console (stderr) via `zap.Logger`. diff --git a/exporter/debugexporter/metadata.yaml b/exporter/debugexporter/metadata.yaml index 4c60b9589e8..2c9f9093c4d 100644 --- a/exporter/debugexporter/metadata.yaml +++ b/exporter/debugexporter/metadata.yaml @@ -4,5 +4,5 @@ status: class: exporter stability: development: [traces, metrics, logs] - distributions: [core, contrib] + distributions: [core, contrib, k8s] warnings: [Unstable Output Format] diff --git a/exporter/nopexporter/README.md b/exporter/nopexporter/README.md index 99b54523fb0..98a98b37ca0 100644 --- a/exporter/nopexporter/README.md +++ b/exporter/nopexporter/README.md @@ -4,12 +4,13 @@ | Status | | | ------------- |-----------| | Stability | [beta]: traces, metrics, logs | -| Distributions | [core], [contrib] | +| Distributions | [core], [contrib], [k8s] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Fnop%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aexporter%2Fnop) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Fnop%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aexporter%2Fnop) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s Serves as a placeholder exporter in a pipeline. This can be useful if you want diff --git a/exporter/nopexporter/metadata.yaml b/exporter/nopexporter/metadata.yaml index 3c61e2e6433..9c0c931892d 100644 --- a/exporter/nopexporter/metadata.yaml +++ b/exporter/nopexporter/metadata.yaml @@ -4,4 +4,4 @@ status: class: exporter stability: beta: [traces, metrics, logs] - distributions: [core, contrib] + distributions: [core, contrib, k8s] diff --git a/exporter/otlpexporter/README.md b/exporter/otlpexporter/README.md index 8926a14369b..b4a5c7b055d 100644 --- a/exporter/otlpexporter/README.md +++ b/exporter/otlpexporter/README.md @@ -5,13 +5,14 @@ | ------------- |-----------| | Stability | [beta]: logs | | | [stable]: traces, metrics | -| Distributions | [core], [contrib] | +| Distributions | [core], [contrib], [k8s] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Fotlp%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aexporter%2Fotlp) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Fotlp%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aexporter%2Fotlp) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [stable]: https://github.com/open-telemetry/opentelemetry-collector#stable [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s Export data via gRPC using [OTLP]( diff --git a/exporter/otlpexporter/metadata.yaml b/exporter/otlpexporter/metadata.yaml index f24e40e1f91..0d517c86116 100644 --- a/exporter/otlpexporter/metadata.yaml +++ b/exporter/otlpexporter/metadata.yaml @@ -5,7 +5,7 @@ status: stability: stable: [traces, metrics] beta: [logs] - distributions: [core, contrib] + distributions: [core, contrib, k8s] tests: config: diff --git a/exporter/otlphttpexporter/README.md b/exporter/otlphttpexporter/README.md index fb15c0dab7a..c41aef98ff6 100644 --- a/exporter/otlphttpexporter/README.md +++ b/exporter/otlphttpexporter/README.md @@ -5,13 +5,14 @@ | ------------- |-----------| | Stability | [beta]: logs | | | [stable]: traces, metrics | -| Distributions | [core], [contrib] | +| Distributions | [core], [contrib], [k8s] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Fotlphttp%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aexporter%2Fotlphttp) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Fotlphttp%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aexporter%2Fotlphttp) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [stable]: https://github.com/open-telemetry/opentelemetry-collector#stable [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s Export traces and/or metrics via HTTP using [OTLP]( diff --git a/exporter/otlphttpexporter/metadata.yaml b/exporter/otlphttpexporter/metadata.yaml index 5e1c41d3243..c5dddcf25e8 100644 --- a/exporter/otlphttpexporter/metadata.yaml +++ b/exporter/otlphttpexporter/metadata.yaml @@ -5,7 +5,7 @@ status: stability: stable: [traces, metrics] beta: [logs] - distributions: [core, contrib] + distributions: [core, contrib, k8s] tests: config: diff --git a/extension/zpagesextension/README.md b/extension/zpagesextension/README.md index bdae98913ef..357552e7513 100644 --- a/extension/zpagesextension/README.md +++ b/extension/zpagesextension/README.md @@ -4,12 +4,13 @@ | Status | | | ------------- |-----------| | Stability | [beta] | -| Distributions | [core], [contrib] | +| Distributions | [core], [contrib], [k8s] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fzpages%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aextension%2Fzpages) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fzpages%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aextension%2Fzpages) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s Enables an extension that serves zPages, an HTTP endpoint that provides live diff --git a/extension/zpagesextension/metadata.yaml b/extension/zpagesextension/metadata.yaml index 558eec8fccd..13101e73964 100644 --- a/extension/zpagesextension/metadata.yaml +++ b/extension/zpagesextension/metadata.yaml @@ -4,4 +4,4 @@ status: class: extension stability: beta: [extension] - distributions: [core, contrib] + distributions: [core, contrib, k8s] diff --git a/processor/batchprocessor/README.md b/processor/batchprocessor/README.md index 85ae733d28a..44b297fc344 100644 --- a/processor/batchprocessor/README.md +++ b/processor/batchprocessor/README.md @@ -4,12 +4,13 @@ | Status | | | ------------- |-----------| | Stability | [beta]: traces, metrics, logs | -| Distributions | [core], [contrib] | +| Distributions | [core], [contrib], [k8s] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aprocessor%2Fbatch%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aprocessor%2Fbatch) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aprocessor%2Fbatch%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aprocessor%2Fbatch) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s The batch processor accepts spans, metrics, or logs and places them into diff --git a/processor/batchprocessor/metadata.yaml b/processor/batchprocessor/metadata.yaml index dd47697b850..06e7065358a 100644 --- a/processor/batchprocessor/metadata.yaml +++ b/processor/batchprocessor/metadata.yaml @@ -4,7 +4,7 @@ status: class: processor stability: beta: [traces, metrics, logs] - distributions: [core, contrib] + distributions: [core, contrib, k8s] tests: diff --git a/processor/memorylimiterprocessor/README.md b/processor/memorylimiterprocessor/README.md index 6f5e51da789..87795b62404 100644 --- a/processor/memorylimiterprocessor/README.md +++ b/processor/memorylimiterprocessor/README.md @@ -4,12 +4,13 @@ | Status | | | ------------- |-----------| | Stability | [beta]: traces, metrics, logs | -| Distributions | [core], [contrib] | +| Distributions | [core], [contrib], [k8s] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aprocessor%2Fmemorylimiter%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aprocessor%2Fmemorylimiter) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aprocessor%2Fmemorylimiter%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aprocessor%2Fmemorylimiter) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s ## Overview diff --git a/processor/memorylimiterprocessor/metadata.yaml b/processor/memorylimiterprocessor/metadata.yaml index 92f9d2f821b..cf155ca04ab 100644 --- a/processor/memorylimiterprocessor/metadata.yaml +++ b/processor/memorylimiterprocessor/metadata.yaml @@ -4,7 +4,7 @@ status: class: processor stability: beta: [traces, metrics, logs] - distributions: [core, contrib] + distributions: [core, contrib, k8s] tests: config: diff --git a/receiver/otlpreceiver/README.md b/receiver/otlpreceiver/README.md index a5572071629..255395fb5d6 100644 --- a/receiver/otlpreceiver/README.md +++ b/receiver/otlpreceiver/README.md @@ -5,13 +5,14 @@ | ------------- |-----------| | Stability | [beta]: logs | | | [stable]: traces, metrics | -| Distributions | [core], [contrib] | +| Distributions | [core], [contrib], [k8s] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fotlp%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Fotlp) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fotlp%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Fotlp) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [stable]: https://github.com/open-telemetry/opentelemetry-collector#stable [core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s Receives data via gRPC or HTTP using [OTLP]( diff --git a/receiver/otlpreceiver/metadata.yaml b/receiver/otlpreceiver/metadata.yaml index c3036a3341d..db490cfe6fe 100644 --- a/receiver/otlpreceiver/metadata.yaml +++ b/receiver/otlpreceiver/metadata.yaml @@ -5,4 +5,4 @@ status: stability: stable: [traces, metrics] beta: [logs] - distributions: [core, contrib] + distributions: [core, contrib, k8s] From 3364ba111a1f89ac3d4e97eaef35d160c69f23ad Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Mon, 24 Jun 2024 10:49:59 +0200 Subject: [PATCH 105/168] [exporter/debug] format spans as one-liners in `normal` verbosity (#10280) #### Description This is an initial barebones implementation that only outputs the span's name, trace ID and span ID. Other useful fields like duration etc. can be added in follow-up enhancements. This pull request is part of https://github.com/open-telemetry/opentelemetry-collector/issues/7806; it implements the change for traces. The changes for [logs](https://github.com/open-telemetry/opentelemetry-collector/pull/10225) and metrics will be proposed in separate pull requests. This change applies to the Debug exporter only. The behavior of the Logging exporter remains unchanged. To use this behavior, switch from the deprecated Logging exporter to Debug exporter. #### Link to tracking issue - https://github.com/open-telemetry/opentelemetry-collector/issues/7806 #### Testing Added unit tests for the formatter. #### Documentation Described the formatting in the Debug exporter's README. --------- Co-authored-by: Pablo Baeyens --- ...ebug-exporter-normal-verbosity-traces.yaml | 25 +++++++++ exporter/debugexporter/README.md | 15 +++--- exporter/debugexporter/exporter.go | 7 ++- .../debugexporter/internal/normal/common.go | 20 ++++++++ .../debugexporter/internal/normal/logs.go | 11 ---- .../debugexporter/internal/normal/traces.go | 51 +++++++++++++++++++ .../internal/normal/traces_test.go | 48 +++++++++++++++++ 7 files changed, 157 insertions(+), 20 deletions(-) create mode 100644 .chloggen/debug-exporter-normal-verbosity-traces.yaml create mode 100644 exporter/debugexporter/internal/normal/common.go create mode 100644 exporter/debugexporter/internal/normal/traces.go create mode 100644 exporter/debugexporter/internal/normal/traces_test.go diff --git a/.chloggen/debug-exporter-normal-verbosity-traces.yaml b/.chloggen/debug-exporter-normal-verbosity-traces.yaml new file mode 100644 index 00000000000..00a105bac1e --- /dev/null +++ b/.chloggen/debug-exporter-normal-verbosity-traces.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporter/debug + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: In `normal` verbosity, display one line of text for each span + +# One or more tracking issues or pull requests related to the change +issues: [7806] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/debugexporter/README.md b/exporter/debugexporter/README.md index 9746c7a1658..1e75cc872ca 100644 --- a/exporter/debugexporter/README.md +++ b/exporter/debugexporter/README.md @@ -63,21 +63,22 @@ Here's an example output: ### Normal verbosity -With `verbosity: normal`, the exporter outputs about one line for each telemetry record, including its body and attributes. +With `verbosity: normal`, the exporter outputs about one line for each telemetry record. The "one line per telemetry record" is not a strict rule. For example, logs with multiline body will be output as multiple lines. > [!IMPORTANT] -> Currently the `normal` verbosity is only implemented for logs. -> Metrics and traces are going to be implemented in the future. -> The current behavior for metrics and traces is the same as in `basic` verbosity. +> Currently the `normal` verbosity is only implemented for logs and traces. +> Metrics are going to be implemented in the future. +> The current behavior for metrics is the same as in `basic` verbosity. Here's an example output: ```console -2024-05-27T12:46:22.423+0200 info LogsExporter {"kind": "exporter", "data_type": "logs", "name": "debug", "resource logs": 1, "log records": 1} -2024-05-27T12:46:22.423+0200 info the message app=server - {"kind": "exporter", "data_type": "logs", "name": "debug"} +2024-05-31T13:26:37.531+0200 info TracesExporter {"kind": "exporter", "data_type": "traces", "name": "debug", "resource spans": 1, "spans": 2} +2024-05-31T13:26:37.531+0200 info okey-dokey-0 082bc2f70f519e32a39fd26ae69b43c0 51201084f4d65159 +lets-go 082bc2f70f519e32a39fd26ae69b43c0 cd321682f3514378 + {"kind": "exporter", "data_type": "traces", "name": "debug"} ``` ### Detailed verbosity diff --git a/exporter/debugexporter/exporter.go b/exporter/debugexporter/exporter.go index ab5865e41c7..6f3a59298d7 100644 --- a/exporter/debugexporter/exporter.go +++ b/exporter/debugexporter/exporter.go @@ -30,17 +30,20 @@ type debugExporter struct { func newDebugExporter(logger *zap.Logger, verbosity configtelemetry.Level) *debugExporter { var logsMarshaler plog.Marshaler + var tracesMarshaler ptrace.Marshaler if verbosity == configtelemetry.LevelDetailed { logsMarshaler = otlptext.NewTextLogsMarshaler() + tracesMarshaler = otlptext.NewTextTracesMarshaler() } else { logsMarshaler = normal.NewNormalLogsMarshaler() + tracesMarshaler = normal.NewNormalTracesMarshaler() } return &debugExporter{ verbosity: verbosity, logger: logger, logsMarshaler: logsMarshaler, metricsMarshaler: otlptext.NewTextMetricsMarshaler(), - tracesMarshaler: otlptext.NewTextTracesMarshaler(), + tracesMarshaler: tracesMarshaler, } } @@ -48,7 +51,7 @@ func (s *debugExporter) pushTraces(_ context.Context, td ptrace.Traces) error { s.logger.Info("TracesExporter", zap.Int("resource spans", td.ResourceSpans().Len()), zap.Int("spans", td.SpanCount())) - if s.verbosity != configtelemetry.LevelDetailed { + if s.verbosity == configtelemetry.LevelBasic { return nil } diff --git a/exporter/debugexporter/internal/normal/common.go b/exporter/debugexporter/internal/normal/common.go new file mode 100644 index 00000000000..957583f9c8e --- /dev/null +++ b/exporter/debugexporter/internal/normal/common.go @@ -0,0 +1,20 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package normal // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/normal" + +import ( + "fmt" + + "go.opentelemetry.io/collector/pdata/pcommon" +) + +// writeAttributes returns a slice of strings in the form "attrKey=attrValue" +func writeAttributes(attributes pcommon.Map) (attributeStrings []string) { + attributes.Range(func(k string, v pcommon.Value) bool { + attribute := fmt.Sprintf("%s=%s", k, v.AsString()) + attributeStrings = append(attributeStrings, attribute) + return true + }) + return attributeStrings +} diff --git a/exporter/debugexporter/internal/normal/logs.go b/exporter/debugexporter/internal/normal/logs.go index 9a2ff4cd808..dbf2e5dda08 100644 --- a/exporter/debugexporter/internal/normal/logs.go +++ b/exporter/debugexporter/internal/normal/logs.go @@ -8,7 +8,6 @@ import ( "fmt" "strings" - "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" ) @@ -40,13 +39,3 @@ func (normalLogsMarshaler) MarshalLogs(ld plog.Logs) ([]byte, error) { } return buffer.Bytes(), nil } - -// writeAttributes returns a slice of strings in the form "attrKey=attrValue" -func writeAttributes(attributes pcommon.Map) (attributeStrings []string) { - attributes.Range(func(k string, v pcommon.Value) bool { - attribute := fmt.Sprintf("%s=%s", k, v.AsString()) - attributeStrings = append(attributeStrings, attribute) - return true - }) - return attributeStrings -} diff --git a/exporter/debugexporter/internal/normal/traces.go b/exporter/debugexporter/internal/normal/traces.go new file mode 100644 index 00000000000..3aa32731ad6 --- /dev/null +++ b/exporter/debugexporter/internal/normal/traces.go @@ -0,0 +1,51 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package normal // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/normal" + +import ( + "bytes" + "strings" + + "go.opentelemetry.io/collector/pdata/ptrace" +) + +type normalTracesMarshaler struct{} + +// Ensure normalTracesMarshaller implements interface ptrace.Marshaler +var _ ptrace.Marshaler = normalTracesMarshaler{} + +// NewNormalTracesMarshaler returns a ptrace.Marshaler for normal verbosity. It writes one line of text per log record +func NewNormalTracesMarshaler() ptrace.Marshaler { + return normalTracesMarshaler{} +} + +func (normalTracesMarshaler) MarshalTraces(md ptrace.Traces) ([]byte, error) { + var buffer bytes.Buffer + for i := 0; i < md.ResourceSpans().Len(); i++ { + resourceTraces := md.ResourceSpans().At(i) + for j := 0; j < resourceTraces.ScopeSpans().Len(); j++ { + scopeTraces := resourceTraces.ScopeSpans().At(j) + for k := 0; k < scopeTraces.Spans().Len(); k++ { + span := scopeTraces.Spans().At(k) + + buffer.WriteString(span.Name()) + + buffer.WriteString(" ") + buffer.WriteString(span.TraceID().String()) + + buffer.WriteString(" ") + buffer.WriteString(span.SpanID().String()) + + if span.Attributes().Len() > 0 { + spanAttributes := writeAttributes(span.Attributes()) + buffer.WriteString(" ") + buffer.WriteString(strings.Join(spanAttributes, " ")) + } + + buffer.WriteString("\n") + } + } + } + return buffer.Bytes(), nil +} diff --git a/exporter/debugexporter/internal/normal/traces_test.go b/exporter/debugexporter/internal/normal/traces_test.go new file mode 100644 index 00000000000..84f69d4a176 --- /dev/null +++ b/exporter/debugexporter/internal/normal/traces_test.go @@ -0,0 +1,48 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package normal + +import ( + "testing" + + "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/collector/pdata/ptrace" +) + +func TestMarshalTraces(t *testing.T) { + tests := []struct { + name string + input ptrace.Traces + expected string + }{ + { + name: "empty traces", + input: ptrace.NewTraces(), + expected: "", + }, + { + name: "one span", + input: func() ptrace.Traces { + traces := ptrace.NewTraces() + span := traces.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty() + span.SetName("span-name") + span.SetTraceID([16]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10}) + span.SetSpanID([8]byte{0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}) + span.Attributes().PutStr("key1", "value1") + span.Attributes().PutStr("key2", "value2") + return traces + }(), + expected: `span-name 0102030405060708090a0b0c0d0e0f10 1112131415161718 key1=value1 key2=value2 +`, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + output, err := NewNormalTracesMarshaler().MarshalTraces(tt.input) + assert.NoError(t, err) + assert.Equal(t, tt.expected, string(output)) + }) + } +} From 1d1ff4a16cb9a1e7890febb37a595a3030dd77b3 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Mon, 24 Jun 2024 16:58:37 +0200 Subject: [PATCH 106/168] [exporter/debug] format metric data points as one-liners in `normal` verbosity (#10462) #### Description This pull request is part of https://github.com/open-telemetry/opentelemetry-collector/issues/7806; it implements the change for metrics. The changes for [logs](https://github.com/open-telemetry/opentelemetry-collector/pull/10225) and [traces](https://github.com/open-telemetry/opentelemetry-collector/pull/10280) have been proposed in separate pull requests. This change applies to the Debug exporter only. The behavior of the Logging exporter remains unchanged. To use this behavior, switch from the deprecated Logging exporter to Debug exporter. #### Link to tracking issue - https://github.com/open-telemetry/opentelemetry-collector/issues/7806 #### Testing Added unit tests for the formatter. #### Documentation Described the formatting in the Debug exporter's README. --- ...ebug-exporter-normal-verbosity-traces.yaml | 25 --- ...l => debug-exporter-normal-verbosity.yaml} | 2 +- exporter/debugexporter/README.md | 13 +- exporter/debugexporter/exporter.go | 7 +- .../debugexporter/internal/normal/metrics.go | 149 ++++++++++++++++++ .../internal/normal/metrics_test.go | 120 ++++++++++++++ 6 files changed, 280 insertions(+), 36 deletions(-) delete mode 100644 .chloggen/debug-exporter-normal-verbosity-traces.yaml rename .chloggen/{debug-exporter-normal-verbosity-logs.yaml => debug-exporter-normal-verbosity.yaml} (90%) create mode 100644 exporter/debugexporter/internal/normal/metrics.go create mode 100644 exporter/debugexporter/internal/normal/metrics_test.go diff --git a/.chloggen/debug-exporter-normal-verbosity-traces.yaml b/.chloggen/debug-exporter-normal-verbosity-traces.yaml deleted file mode 100644 index 00a105bac1e..00000000000 --- a/.chloggen/debug-exporter-normal-verbosity-traces.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporter/debug - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: In `normal` verbosity, display one line of text for each span - -# One or more tracking issues or pull requests related to the change -issues: [7806] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/debug-exporter-normal-verbosity-logs.yaml b/.chloggen/debug-exporter-normal-verbosity.yaml similarity index 90% rename from .chloggen/debug-exporter-normal-verbosity-logs.yaml rename to .chloggen/debug-exporter-normal-verbosity.yaml index d874275a547..8fe3264a232 100644 --- a/.chloggen/debug-exporter-normal-verbosity-logs.yaml +++ b/.chloggen/debug-exporter-normal-verbosity.yaml @@ -7,7 +7,7 @@ change_type: enhancement component: exporter/debug # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: In `normal` verbosity, display one line of text for each log record +note: In `normal` verbosity, display one line of text for each telemetry record (log, data point, span) # One or more tracking issues or pull requests related to the change issues: [7806] diff --git a/exporter/debugexporter/README.md b/exporter/debugexporter/README.md index 1e75cc872ca..f10b6ee8f87 100644 --- a/exporter/debugexporter/README.md +++ b/exporter/debugexporter/README.md @@ -67,17 +67,12 @@ With `verbosity: normal`, the exporter outputs about one line for each telemetry The "one line per telemetry record" is not a strict rule. For example, logs with multiline body will be output as multiple lines. -> [!IMPORTANT] -> Currently the `normal` verbosity is only implemented for logs and traces. -> Metrics are going to be implemented in the future. -> The current behavior for metrics is the same as in `basic` verbosity. - Here's an example output: ```console -2024-05-31T13:26:37.531+0200 info TracesExporter {"kind": "exporter", "data_type": "traces", "name": "debug", "resource spans": 1, "spans": 2} -2024-05-31T13:26:37.531+0200 info okey-dokey-0 082bc2f70f519e32a39fd26ae69b43c0 51201084f4d65159 -lets-go 082bc2f70f519e32a39fd26ae69b43c0 cd321682f3514378 +2024-06-24T15:18:58.559+0200 info TracesExporter {"kind": "exporter", "data_type": "traces", "name": "debug", "resource spans": 1, "spans": 2} +2024-06-24T15:18:58.559+0200 info okey-dokey-0 4bdc558f0f0650e3ccaac8f3ae133954 8b69459f015c164b net.peer.ip=1.2.3.4 peer.service=telemetrygen-client +lets-go 4bdc558f0f0650e3ccaac8f3ae133954 8820ee5366817639 net.peer.ip=1.2.3.4 peer.service=telemetrygen-server {"kind": "exporter", "data_type": "traces", "name": "debug"} ``` @@ -128,3 +123,5 @@ Attributes: ## Warnings - Unstable Output Format: The output formats for all verbosity levels is not guaranteed and may be changed at any time without a breaking change. + +[telemetrygen]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/cmd/telemetrygen diff --git a/exporter/debugexporter/exporter.go b/exporter/debugexporter/exporter.go index 6f3a59298d7..324cd19935c 100644 --- a/exporter/debugexporter/exporter.go +++ b/exporter/debugexporter/exporter.go @@ -30,19 +30,22 @@ type debugExporter struct { func newDebugExporter(logger *zap.Logger, verbosity configtelemetry.Level) *debugExporter { var logsMarshaler plog.Marshaler + var metricsMarshaler pmetric.Marshaler var tracesMarshaler ptrace.Marshaler if verbosity == configtelemetry.LevelDetailed { logsMarshaler = otlptext.NewTextLogsMarshaler() + metricsMarshaler = otlptext.NewTextMetricsMarshaler() tracesMarshaler = otlptext.NewTextTracesMarshaler() } else { logsMarshaler = normal.NewNormalLogsMarshaler() + metricsMarshaler = normal.NewNormalMetricsMarshaler() tracesMarshaler = normal.NewNormalTracesMarshaler() } return &debugExporter{ verbosity: verbosity, logger: logger, logsMarshaler: logsMarshaler, - metricsMarshaler: otlptext.NewTextMetricsMarshaler(), + metricsMarshaler: metricsMarshaler, tracesMarshaler: tracesMarshaler, } } @@ -68,7 +71,7 @@ func (s *debugExporter) pushMetrics(_ context.Context, md pmetric.Metrics) error zap.Int("resource metrics", md.ResourceMetrics().Len()), zap.Int("metrics", md.MetricCount()), zap.Int("data points", md.DataPointCount())) - if s.verbosity != configtelemetry.LevelDetailed { + if s.verbosity == configtelemetry.LevelBasic { return nil } diff --git a/exporter/debugexporter/internal/normal/metrics.go b/exporter/debugexporter/internal/normal/metrics.go new file mode 100644 index 00000000000..c8e8eca17d6 --- /dev/null +++ b/exporter/debugexporter/internal/normal/metrics.go @@ -0,0 +1,149 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package normal // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/normal" + +import ( + "bytes" + "fmt" + "strings" + + "go.opentelemetry.io/collector/pdata/pmetric" +) + +type normalMetricsMarshaler struct{} + +// Ensure normalMetricsMarshaller implements interface pmetric.Marshaler +var _ pmetric.Marshaler = normalMetricsMarshaler{} + +// NewNormalMetricsMarshaler returns a pmetric.Marshaler for normal verbosity. It writes one line of text per log record +func NewNormalMetricsMarshaler() pmetric.Marshaler { + return normalMetricsMarshaler{} +} + +func (normalMetricsMarshaler) MarshalMetrics(md pmetric.Metrics) ([]byte, error) { + var buffer bytes.Buffer + for i := 0; i < md.ResourceMetrics().Len(); i++ { + resourceMetrics := md.ResourceMetrics().At(i) + for j := 0; j < resourceMetrics.ScopeMetrics().Len(); j++ { + scopeMetrics := resourceMetrics.ScopeMetrics().At(j) + for k := 0; k < scopeMetrics.Metrics().Len(); k++ { + metric := scopeMetrics.Metrics().At(k) + + var dataPointLines []string + switch metric.Type() { + case pmetric.MetricTypeGauge: + dataPointLines = writeNumberDataPoints(metric, metric.Gauge().DataPoints()) + case pmetric.MetricTypeSum: + dataPointLines = writeNumberDataPoints(metric, metric.Sum().DataPoints()) + case pmetric.MetricTypeHistogram: + dataPointLines = writeHistogramDataPoints(metric) + case pmetric.MetricTypeExponentialHistogram: + dataPointLines = writeExponentialHistogramDataPoints(metric) + case pmetric.MetricTypeSummary: + dataPointLines = writeSummaryDataPoints(metric) + } + for _, line := range dataPointLines { + buffer.WriteString(line) + } + } + } + } + return buffer.Bytes(), nil +} + +func writeNumberDataPoints(metric pmetric.Metric, dataPoints pmetric.NumberDataPointSlice) (lines []string) { + for i := 0; i < dataPoints.Len(); i++ { + dataPoint := dataPoints.At(i) + dataPointAttributes := writeAttributes(dataPoint.Attributes()) + + var value string + switch dataPoint.ValueType() { + case pmetric.NumberDataPointValueTypeInt: + value = fmt.Sprintf("%v", dataPoint.IntValue()) + case pmetric.NumberDataPointValueTypeDouble: + value = fmt.Sprintf("%v", dataPoint.DoubleValue()) + } + + dataPointLine := fmt.Sprintf("%s{%s} %s\n", metric.Name(), strings.Join(dataPointAttributes, ","), value) + lines = append(lines, dataPointLine) + } + return lines +} + +func writeHistogramDataPoints(metric pmetric.Metric) (lines []string) { + for i := 0; i < metric.Histogram().DataPoints().Len(); i++ { + dataPoint := metric.Histogram().DataPoints().At(i) + dataPointAttributes := writeAttributes(dataPoint.Attributes()) + + var value string + value = fmt.Sprintf("count=%d", dataPoint.Count()) + if dataPoint.HasSum() { + value += fmt.Sprintf(" sum=%v", dataPoint.Sum()) + } + if dataPoint.HasMin() { + value += fmt.Sprintf(" min=%v", dataPoint.Min()) + } + if dataPoint.HasMax() { + value += fmt.Sprintf(" max=%v", dataPoint.Max()) + } + + for bucketIndex := 0; bucketIndex < dataPoint.BucketCounts().Len(); bucketIndex++ { + bucketBound := "" + if bucketIndex < dataPoint.ExplicitBounds().Len() { + bucketBound = fmt.Sprintf("le%v=", dataPoint.ExplicitBounds().At(bucketIndex)) + } + bucketCount := dataPoint.BucketCounts().At(bucketIndex) + value += fmt.Sprintf(" %s%d", bucketBound, bucketCount) + } + + dataPointLine := fmt.Sprintf("%s{%s} %s\n", metric.Name(), strings.Join(dataPointAttributes, ","), value) + lines = append(lines, dataPointLine) + } + return lines +} + +func writeExponentialHistogramDataPoints(metric pmetric.Metric) (lines []string) { + for i := 0; i < metric.ExponentialHistogram().DataPoints().Len(); i++ { + dataPoint := metric.ExponentialHistogram().DataPoints().At(i) + dataPointAttributes := writeAttributes(dataPoint.Attributes()) + + var value string + value = fmt.Sprintf("count=%d", dataPoint.Count()) + if dataPoint.HasSum() { + value += fmt.Sprintf(" sum=%v", dataPoint.Sum()) + } + if dataPoint.HasMin() { + value += fmt.Sprintf(" min=%v", dataPoint.Min()) + } + if dataPoint.HasMax() { + value += fmt.Sprintf(" max=%v", dataPoint.Max()) + } + + // TODO display buckets + + dataPointLine := fmt.Sprintf("%s{%s} %s\n", metric.Name(), strings.Join(dataPointAttributes, ","), value) + lines = append(lines, dataPointLine) + } + return lines +} + +func writeSummaryDataPoints(metric pmetric.Metric) (lines []string) { + for i := 0; i < metric.Summary().DataPoints().Len(); i++ { + dataPoint := metric.Summary().DataPoints().At(i) + dataPointAttributes := writeAttributes(dataPoint.Attributes()) + + var value string + value = fmt.Sprintf("count=%d", dataPoint.Count()) + value += fmt.Sprintf(" sum=%f", dataPoint.Sum()) + + for quantileIndex := 0; quantileIndex < dataPoint.QuantileValues().Len(); quantileIndex++ { + quantile := dataPoint.QuantileValues().At(quantileIndex) + value += fmt.Sprintf(" q%v=%v", quantile.Quantile(), quantile.Value()) + } + + dataPointLine := fmt.Sprintf("%s{%s} %s\n", metric.Name(), strings.Join(dataPointAttributes, ","), value) + lines = append(lines, dataPointLine) + } + return lines +} diff --git a/exporter/debugexporter/internal/normal/metrics_test.go b/exporter/debugexporter/internal/normal/metrics_test.go new file mode 100644 index 00000000000..8d941297cf6 --- /dev/null +++ b/exporter/debugexporter/internal/normal/metrics_test.go @@ -0,0 +1,120 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package normal + +import ( + "testing" + + "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/collector/pdata/pmetric" +) + +func TestMarshalMetrics(t *testing.T) { + tests := []struct { + name string + input pmetric.Metrics + expected string + }{ + { + name: "empty metrics", + input: pmetric.NewMetrics(), + expected: "", + }, + { + name: "sum data point", + input: func() pmetric.Metrics { + metrics := pmetric.NewMetrics() + metric := metrics.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty().Metrics().AppendEmpty() + metric.SetName("system.cpu.time") + dataPoint := metric.SetEmptySum().DataPoints().AppendEmpty() + dataPoint.SetDoubleValue(123.456) + dataPoint.Attributes().PutStr("state", "user") + dataPoint.Attributes().PutStr("cpu", "0") + return metrics + }(), + expected: `system.cpu.time{state=user,cpu=0} 123.456 +`, + }, + { + name: "gauge data point", + input: func() pmetric.Metrics { + metrics := pmetric.NewMetrics() + metric := metrics.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty().Metrics().AppendEmpty() + metric.SetName("system.cpu.utilization") + dataPoint := metric.SetEmptyGauge().DataPoints().AppendEmpty() + dataPoint.SetDoubleValue(78.901234567) + dataPoint.Attributes().PutStr("state", "free") + dataPoint.Attributes().PutStr("cpu", "8") + return metrics + }(), + expected: `system.cpu.utilization{state=free,cpu=8} 78.901234567 +`, + }, + { + name: "histogram", + input: func() pmetric.Metrics { + metrics := pmetric.NewMetrics() + metric := metrics.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty().Metrics().AppendEmpty() + metric.SetName("http.server.request.duration") + dataPoint := metric.SetEmptyHistogram().DataPoints().AppendEmpty() + dataPoint.Attributes().PutInt("http.response.status_code", 200) + dataPoint.Attributes().PutStr("http.request.method", "GET") + dataPoint.ExplicitBounds().FromRaw([]float64{0.125, 0.5, 1, 3}) + dataPoint.BucketCounts().FromRaw([]uint64{1324, 13, 0, 2, 1}) + dataPoint.SetCount(1340) + dataPoint.SetSum(99.573) + dataPoint.SetMin(0.017) + dataPoint.SetMax(8.13) + return metrics + }(), + expected: `http.server.request.duration{http.response.status_code=200,http.request.method=GET} count=1340 sum=99.573 min=0.017 max=8.13 le0.125=1324 le0.5=13 le1=0 le3=2 1 +`, + }, + { + name: "exponential histogram", + input: func() pmetric.Metrics { + metrics := pmetric.NewMetrics() + metric := metrics.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty().Metrics().AppendEmpty() + metric.SetName("http.server.request.duration") + dataPoint := metric.SetEmptyExponentialHistogram().DataPoints().AppendEmpty() + dataPoint.Attributes().PutInt("http.response.status_code", 200) + dataPoint.Attributes().PutStr("http.request.method", "GET") + dataPoint.SetCount(1340) + dataPoint.SetSum(99.573) + dataPoint.SetMin(0.017) + dataPoint.SetMax(8.13) + return metrics + }(), + expected: `http.server.request.duration{http.response.status_code=200,http.request.method=GET} count=1340 sum=99.573 min=0.017 max=8.13 +`, + }, + { + name: "summary", + input: func() pmetric.Metrics { + metrics := pmetric.NewMetrics() + metric := metrics.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty().Metrics().AppendEmpty() + metric.SetName("summary") + dataPoint := metric.SetEmptySummary().DataPoints().AppendEmpty() + dataPoint.Attributes().PutInt("http.response.status_code", 200) + dataPoint.Attributes().PutStr("http.request.method", "GET") + dataPoint.SetCount(1340) + dataPoint.SetSum(99.573) + quantile := dataPoint.QuantileValues().AppendEmpty() + quantile.SetQuantile(0.01) + quantile.SetValue(15) + return metrics + }(), + expected: `summary{http.response.status_code=200,http.request.method=GET} count=1340 sum=99.573000 q0.01=15 +`, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + output, err := NewNormalMetricsMarshaler().MarshalMetrics(tt.input) + assert.NoError(t, err) + assert.Equal(t, tt.expected, string(output)) + }) + } +} From 227fb823dbf33e6a62b842aef5a70e10ed1db84f Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Mon, 24 Jun 2024 16:58:57 +0200 Subject: [PATCH 107/168] Add pprofile wrapper and testdata (#10401) #### Description This adds pprofile wrapper (the non-generated bit of pprofile), as well as test data. cc @mx-psi --------- Co-authored-by: Pablo Baeyens --- .chloggen/pprofile-wrapper.yaml | 25 ++++++++ .chloggen/profile-testdata.yaml | 25 ++++++++ Makefile | 2 + cmd/builder/internal/builder/main_test.go | 1 + cmd/mdatagen/go.mod | 2 + cmd/otelcorecol/builder-config.yaml | 5 +- cmd/otelcorecol/go.mod | 2 + config/configgrpc/go.mod | 3 + config/confighttp/go.mod | 2 + config/internal/go.mod | 2 + confmap/converter/expandconverter/go.mod | 2 + connector/forwardconnector/go.mod | 2 + connector/go.mod | 3 + consumer/go.mod | 4 +- consumer/go.sum | 1 - exporter/debugexporter/go.mod | 3 + exporter/go.mod | 3 + exporter/loggingexporter/go.mod | 2 + exporter/nopexporter/go.mod | 2 + exporter/otlpexporter/go.mod | 3 + exporter/otlphttpexporter/go.mod | 2 + extension/ballastextension/go.mod | 2 + extension/memorylimiterextension/go.mod | 2 + extension/zpagesextension/go.mod | 2 + go.mod | 3 + internal/e2e/go.mod | 3 + otelcol/go.mod | 3 + otelcol/otelcoltest/go.mod | 3 + pdata/internal/wrapper_profiles.go | 46 +++++++++++++++ pdata/pprofile/profiles.go | 51 +++++++++++++++++ pdata/pprofile/profiles_test.go | 69 +++++++++++++++++++++++ pdata/testdata/go.mod | 7 ++- pdata/testdata/profile.go | 46 +++++++++++++++ processor/batchprocessor/go.mod | 3 + processor/go.mod | 3 + processor/memorylimiterprocessor/go.mod | 3 + receiver/go.mod | 2 + receiver/nopreceiver/go.mod | 2 + receiver/otlpreceiver/go.mod | 3 + service/go.mod | 3 + 40 files changed, 347 insertions(+), 5 deletions(-) create mode 100644 .chloggen/pprofile-wrapper.yaml create mode 100644 .chloggen/profile-testdata.yaml create mode 100644 pdata/internal/wrapper_profiles.go create mode 100644 pdata/pprofile/profiles.go create mode 100644 pdata/pprofile/profiles_test.go create mode 100644 pdata/testdata/profile.go diff --git a/.chloggen/pprofile-wrapper.yaml b/.chloggen/pprofile-wrapper.yaml new file mode 100644 index 00000000000..bd69f1e9925 --- /dev/null +++ b/.chloggen/pprofile-wrapper.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: pdata/pprofile + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add pprofile wrapper to convert proto into pprofile. + +# One or more tracking issues or pull requests related to the change +issues: [10401] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/.chloggen/profile-testdata.yaml b/.chloggen/profile-testdata.yaml new file mode 100644 index 00000000000..fb2be1ee340 --- /dev/null +++ b/.chloggen/profile-testdata.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: pdata/testdata + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add pdata testdata for profiles. + +# One or more tracking issues or pull requests related to the change +issues: [10401] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/Makefile b/Makefile index 067da69bd5d..60ee82a7681 100644 --- a/Makefile +++ b/Makefile @@ -284,6 +284,7 @@ check-contrib: -replace go.opentelemetry.io/collector/otelcol/otelcoltest=$(CURDIR)/otelcol/otelcoltest \ -replace go.opentelemetry.io/collector/pdata=$(CURDIR)/pdata \ -replace go.opentelemetry.io/collector/pdata/testdata=$(CURDIR)/pdata/testdata \ + -replace go.opentelemetry.io/collector/pdata/pprofile=$(CURDIR)/pdata/pprofile \ -replace go.opentelemetry.io/collector/processor=$(CURDIR)/processor \ -replace go.opentelemetry.io/collector/processor/batchprocessor=$(CURDIR)/processor/batchprocessor \ -replace go.opentelemetry.io/collector/processor/memorylimiterprocessor=$(CURDIR)/processor/memorylimiterprocessor \ @@ -341,6 +342,7 @@ restore-contrib: -dropreplace go.opentelemetry.io/collector/otelcol/otelcoltest \ -dropreplace go.opentelemetry.io/collector/pdata \ -dropreplace go.opentelemetry.io/collector/pdata/testdata \ + -dropreplace go.opentelemetry.io/collector/pdata/pprofile \ -dropreplace go.opentelemetry.io/collector/processor \ -dropreplace go.opentelemetry.io/collector/processor/batchprocessor \ -dropreplace go.opentelemetry.io/collector/processor/memorylimiterprocessor \ diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index fa0c0d35d24..ea39bcf785c 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -78,6 +78,7 @@ var ( "/otelcol", "/pdata", "/pdata/testdata", + "/pdata/pprofile", "/semconv", "/service", } diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 45649111b17..e96e33fbcc4 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -87,3 +87,5 @@ retract ( v0.76.1 v0.65.0 ) + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 6197cd1c540..5630bd9ac80 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -1,8 +1,8 @@ # NOTE: # This builder configuration is NOT used to build any official binary. -# To see the builder manifests used for official binaries, +# To see the builder manifests used for official binaries, # check https://github.com/open-telemetry/opentelemetry-collector-releases -# +# # For the OpenTelemetry Collector Core official distribution sources, check # https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol @@ -77,6 +77,7 @@ replaces: - go.opentelemetry.io/collector/featuregate => ../../featuregate - go.opentelemetry.io/collector/pdata => ../../pdata - go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata + - go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile - go.opentelemetry.io/collector/processor => ../../processor - go.opentelemetry.io/collector/receiver => ../../receiver - go.opentelemetry.io/collector/receiver/nopreceiver => ../../receiver/nopreceiver diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 19864d8c1f6..40274203ee1 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -203,6 +203,8 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + replace go.opentelemetry.io/collector/processor => ../../processor replace go.opentelemetry.io/collector/receiver => ../../receiver diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 7d3954590d3..82b0d2755d8 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -52,6 +52,7 @@ require ( go.opentelemetry.io/collector/confmap v0.103.0 // indirect go.opentelemetry.io/collector/extension v0.103.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect @@ -94,6 +95,8 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/consumer => ../../consumer diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index beb57170b41..cbca50bb8c1 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -91,3 +91,5 @@ replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/consumer => ../../consumer replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/config/internal/go.mod b/config/internal/go.mod index 302136bd7f5..7935ffc8420 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -33,3 +33,5 @@ replace go.opentelemetry.io/collector/consumer => ../../consumer replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index f622a5442d2..e2c0bd1125f 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -40,3 +40,5 @@ replace go.opentelemetry.io/collector/pdata => ../../../pdata replace go.opentelemetry.io/collector/featuregate => ../../../featuregate replace go.opentelemetry.io/collector/consumer => ../../../consumer + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../../pdata/pprofile diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index d24d5022777..ee5c2b80467 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -77,3 +77,5 @@ retract ( ) replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/connector/go.mod b/connector/go.mod index ec511264df7..4bb65875437 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -31,6 +31,7 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect @@ -61,3 +62,5 @@ replace go.opentelemetry.io/collector/featuregate => ../featuregate replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata + +replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile diff --git a/consumer/go.mod b/consumer/go.mod index 121a85a3ca1..5afc53a9c3d 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -13,10 +13,10 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kr/text v0.2.0 // indirect 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/pdata/pprofile v0.103.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.23.0 // indirect golang.org/x/sys v0.18.0 // indirect @@ -31,6 +31,8 @@ replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + retract ( v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1 v0.69.0 // Release failed, use v0.69.1 diff --git a/consumer/go.sum b/consumer/go.sum index 4ae987d011c..ff7072f4244 100644 --- a/consumer/go.sum +++ b/consumer/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.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index d7b06607b5d..dc28381d31e 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -43,6 +43,7 @@ require ( go.opentelemetry.io/collector/config/configretry v0.103.0 // indirect go.opentelemetry.io/collector/extension v0.103.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/collector/receiver v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect @@ -76,6 +77,8 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + replace go.opentelemetry.io/collector/receiver => ../../receiver replace go.opentelemetry.io/collector/extension => ../../extension diff --git a/exporter/go.mod b/exporter/go.mod index 6b36eb211cf..c84500495f6 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -51,6 +51,7 @@ require ( github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/confmap v0.103.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/text v0.15.0 // indirect @@ -75,6 +76,8 @@ replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + replace go.opentelemetry.io/collector/receiver => ../receiver retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 70b16b95bc1..c03f7bca6e7 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -88,3 +88,5 @@ retract ( replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index 11b194e85b7..dfee2fb64d2 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -78,3 +78,5 @@ replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/extension => ../../extension + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 171134158ab..0582666f260 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -59,6 +59,7 @@ require ( go.opentelemetry.io/collector/extension v0.103.0 // indirect go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/collector/receiver v0.103.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect @@ -116,6 +117,8 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + replace go.opentelemetry.io/collector/receiver => ../../receiver replace go.opentelemetry.io/collector/consumer => ../../consumer diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 9611315bdcd..61c34d04c25 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -115,6 +115,8 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + replace go.opentelemetry.io/collector/receiver => ../../receiver replace go.opentelemetry.io/collector/consumer => ../../consumer diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index c174281d886..40eec48ca11 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -81,3 +81,5 @@ retract ( replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 892db56f289..85017f19736 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -75,3 +75,5 @@ replace go.opentelemetry.io/collector/consumer => ../../consumer replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 39eac98fb79..94fbb642050 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -113,3 +113,5 @@ replace go.opentelemetry.io/collector/config/configauth => ../../config/configau replace go.opentelemetry.io/collector/extension/auth => ../auth replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/go.mod b/go.mod index 06653587634..9531c1b08f0 100644 --- a/go.mod +++ b/go.mod @@ -57,6 +57,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect @@ -101,3 +102,5 @@ retract ( v0.57.0 // Release failed, use v0.57.2 v0.32.0 // Contains incomplete metrics transition to proto 0.9.0, random components are not working. ) + +replace go.opentelemetry.io/collector/pdata/pprofile => ./pdata/pprofile diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 648508434b8..62b7951791e 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -62,6 +62,7 @@ require ( go.opentelemetry.io/collector/extension v0.103.0 // indirect go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect @@ -121,6 +122,8 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + replace go.opentelemetry.io/collector/consumer => ../../consumer replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver diff --git a/otelcol/go.mod b/otelcol/go.mod index 9ad6a104267..29c3cfd6540 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -70,6 +70,7 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/consumer v0.103.0 // indirect go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.103.0 // indirect go.opentelemetry.io/collector/semconv v0.103.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect @@ -109,6 +110,8 @@ replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension replace go.opentelemetry.io/collector/extension => ../extension diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 1a415596200..0a786db0a56 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -65,6 +65,7 @@ require ( go.opentelemetry.io/collector/consumer v0.103.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.103.0 // indirect go.opentelemetry.io/collector/semconv v0.103.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect @@ -136,6 +137,8 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata replace go.opentelemetry.io/collector/pdata => ../../pdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + replace go.opentelemetry.io/collector/confmap/provider/httpsprovider => ../../confmap/provider/httpsprovider replace go.opentelemetry.io/collector/connector => ../../connector diff --git a/pdata/internal/wrapper_profiles.go b/pdata/internal/wrapper_profiles.go new file mode 100644 index 00000000000..564c8945862 --- /dev/null +++ b/pdata/internal/wrapper_profiles.go @@ -0,0 +1,46 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package internal // import "go.opentelemetry.io/collector/pdata/internal" + +import ( + otlpcollectorprofile "go.opentelemetry.io/collector/pdata/internal/data/protogen/collector/profiles/v1experimental" + otlpprofile "go.opentelemetry.io/collector/pdata/internal/data/protogen/profiles/v1experimental" +) + +type Profiles struct { + orig *otlpcollectorprofile.ExportProfilesServiceRequest + state *State +} + +func GetOrigProfiles(ms Profiles) *otlpcollectorprofile.ExportProfilesServiceRequest { + return ms.orig +} + +func GetProfilesState(ms Profiles) *State { + return ms.state +} + +func SetProfilesState(ms Profiles, state State) { + *ms.state = state +} + +func NewProfiles(orig *otlpcollectorprofile.ExportProfilesServiceRequest, state *State) Profiles { + return Profiles{orig: orig, state: state} +} + +// ProfilesToProto internal helper to convert Profiles to protobuf representation. +func ProfilesToProto(l Profiles) otlpprofile.ProfilesData { + return otlpprofile.ProfilesData{ + ResourceProfiles: l.orig.ResourceProfiles, + } +} + +// ProfilesFromProto internal helper to convert protobuf representation to Profiles. +// This function set exclusive state assuming that it's called only once per Profiles. +func ProfilesFromProto(orig otlpprofile.ProfilesData) Profiles { + state := StateMutable + return NewProfiles(&otlpcollectorprofile.ExportProfilesServiceRequest{ + ResourceProfiles: orig.ResourceProfiles, + }, &state) +} diff --git a/pdata/pprofile/profiles.go b/pdata/pprofile/profiles.go new file mode 100644 index 00000000000..4a81effa3d2 --- /dev/null +++ b/pdata/pprofile/profiles.go @@ -0,0 +1,51 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package pprofile // import "go.opentelemetry.io/collector/pdata/pprofile" + +import ( + "go.opentelemetry.io/collector/pdata/internal" + otlpcollectorprofile "go.opentelemetry.io/collector/pdata/internal/data/protogen/collector/profiles/v1experimental" +) + +// profiles is the top-level struct that is propagated through the profiles pipeline. +// Use NewProfiles to create new instance, zero-initialized instance is not valid for use. +type Profiles internal.Profiles + +func newProfiles(orig *otlpcollectorprofile.ExportProfilesServiceRequest) Profiles { + state := internal.StateMutable + return Profiles(internal.NewProfiles(orig, &state)) +} + +func (ms Profiles) getOrig() *otlpcollectorprofile.ExportProfilesServiceRequest { + return internal.GetOrigProfiles(internal.Profiles(ms)) +} + +func (ms Profiles) getState() *internal.State { + return internal.GetProfilesState(internal.Profiles(ms)) +} + +// NewProfiles creates a new Profiles struct. +func NewProfiles() Profiles { + return newProfiles(&otlpcollectorprofile.ExportProfilesServiceRequest{}) +} + +// IsReadOnly returns true if this ResourceProfiles instance is read-only. +func (ms Profiles) IsReadOnly() bool { + return *ms.getState() == internal.StateReadOnly +} + +// CopyTo copies the Profiles instance overriding the destination. +func (ms Profiles) CopyTo(dest Profiles) { + ms.ResourceProfiles().CopyTo(dest.ResourceProfiles()) +} + +// ResourceProfiles returns the ResourceProfilesSlice associated with this Profiles. +func (ms Profiles) ResourceProfiles() ResourceProfilesSlice { + return newResourceProfilesSlice(&ms.getOrig().ResourceProfiles, internal.GetProfilesState(internal.Profiles(ms))) +} + +// MarkReadOnly marks the ResourceProfiles as shared so that no further modifications can be done on it. +func (ms Profiles) MarkReadOnly() { + internal.SetProfilesState(internal.Profiles(ms), internal.StateReadOnly) +} diff --git a/pdata/pprofile/profiles_test.go b/pdata/pprofile/profiles_test.go new file mode 100644 index 00000000000..010637fcd31 --- /dev/null +++ b/pdata/pprofile/profiles_test.go @@ -0,0 +1,69 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package pprofile + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/collector/pdata/pcommon" +) + +func TestReadOnlyProfilesInvalidUsage(t *testing.T) { + profiles := NewProfiles() + assert.False(t, profiles.IsReadOnly()) + res := profiles.ResourceProfiles().AppendEmpty().Resource() + res.Attributes().PutStr("k1", "v1") + profiles.MarkReadOnly() + assert.True(t, profiles.IsReadOnly()) + assert.Panics(t, func() { res.Attributes().PutStr("k2", "v2") }) +} + +func BenchmarkProfilesUsage(b *testing.B) { + profiles := NewProfiles() + fillTestResourceProfilesSlice(profiles.ResourceProfiles()) + ts := pcommon.NewTimestampFromTime(time.Now()) + + b.ReportAllocs() + b.ResetTimer() + + for bb := 0; bb < b.N; bb++ { + for i := 0; i < profiles.ResourceProfiles().Len(); i++ { + rs := profiles.ResourceProfiles().At(i) + res := rs.Resource() + res.Attributes().PutStr("foo", "bar") + v, ok := res.Attributes().Get("foo") + assert.True(b, ok) + assert.Equal(b, "bar", v.Str()) + v.SetStr("new-bar") + assert.Equal(b, "new-bar", v.Str()) + res.Attributes().Remove("foo") + for j := 0; j < rs.ScopeProfiles().Len(); j++ { + iss := rs.ScopeProfiles().At(j) + iss.Scope().SetName("new_test_name") + assert.Equal(b, "new_test_name", iss.Scope().Name()) + for k := 0; k < iss.Profiles().Len(); k++ { + s := iss.Profiles().At(k) + s.ProfileID().FromRaw([]byte("profile_id")) + assert.Equal(b, "profile_id", string(s.ProfileID().AsRaw())) + s.SetStartTime(ts) + assert.Equal(b, ts, s.StartTime()) + s.SetEndTime(ts) + assert.Equal(b, ts, s.EndTime()) + } + s := iss.Profiles().AppendEmpty() + s.ProfileID().FromRaw([]byte("new_profile_id")) + s.SetStartTime(ts) + s.SetEndTime(ts) + s.Attributes().PutStr("foo1", "bar1") + s.Attributes().PutStr("foo2", "bar2") + iss.Profiles().RemoveIf(func(lr ProfileContainer) bool { + return string(lr.ProfileID().AsRaw()) == "new_profile_id" + }) + } + } + } +} diff --git a/pdata/testdata/go.mod b/pdata/testdata/go.mod index b310727a48f..dd15ae52815 100644 --- a/pdata/testdata/go.mod +++ b/pdata/testdata/go.mod @@ -2,7 +2,10 @@ module go.opentelemetry.io/collector/pdata/testdata go 1.21.0 -require go.opentelemetry.io/collector/pdata v1.10.0 +require ( + go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 +) require ( github.com/gogo/protobuf v1.3.2 // indirect @@ -19,3 +22,5 @@ require ( ) replace go.opentelemetry.io/collector/pdata => ../ + +replace go.opentelemetry.io/collector/pdata/pprofile => ../pprofile diff --git a/pdata/testdata/profile.go b/pdata/testdata/profile.go new file mode 100644 index 00000000000..04df7cc06f8 --- /dev/null +++ b/pdata/testdata/profile.go @@ -0,0 +1,46 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package testdata // import "go.opentelemetry.io/collector/pdata/testdata" + +import ( + "time" + + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pprofile" +) + +var ( + profileStartTimestamp = pcommon.NewTimestampFromTime(time.Date(2020, 2, 11, 20, 26, 12, 321, time.UTC)) + profileEndTimestamp = pcommon.NewTimestampFromTime(time.Date(2020, 2, 11, 20, 26, 13, 789, time.UTC)) +) + +// GenerateProfiles generates dummy profiling data for tests +func GenerateProfiles(profilesCount int) pprofile.Profiles { + td := pprofile.NewProfiles() + initResource(td.ResourceProfiles().AppendEmpty().Resource()) + ss := td.ResourceProfiles().At(0).ScopeProfiles().AppendEmpty().Profiles() + ss.EnsureCapacity(profilesCount) + for i := 0; i < profilesCount; i++ { + switch i % 2 { + case 0: + fillProfileOne(ss.AppendEmpty()) + case 1: + fillProfileTwo(ss.AppendEmpty()) + } + } + return td +} + +func fillProfileOne(profile pprofile.ProfileContainer) { + profile.ProfileID().FromRaw([]byte("profileA")) + profile.SetStartTime(profileStartTimestamp) + profile.SetEndTime(profileEndTimestamp) + profile.SetDroppedAttributesCount(1) +} + +func fillProfileTwo(profile pprofile.ProfileContainer) { + profile.ProfileID().FromRaw([]byte("profileB")) + profile.SetStartTime(profileStartTimestamp) + profile.SetEndTime(profileEndTimestamp) +} diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 5b9cdc0af1d..82ae287c710 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -44,6 +44,7 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -78,3 +79,5 @@ retract ( ) replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/processor/go.mod b/processor/go.mod index 97acff2356d..d202175e947 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -34,6 +34,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -60,4 +61,6 @@ replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata +replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 69b5c61fa77..742ec39145c 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -45,6 +45,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.103.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect @@ -85,3 +86,5 @@ retract ( ) replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/receiver/go.mod b/receiver/go.mod index c1a73d56abb..4df1edb183a 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -62,3 +62,5 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry + +replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index c034cd2f02c..f883f64c2f6 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -71,3 +71,5 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con replace go.opentelemetry.io/collector => ../.. replace go.opentelemetry.io/collector/featuregate => ../../featuregate + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 07da9641f2d..3b24dc33d7c 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -61,6 +61,7 @@ require ( go.opentelemetry.io/collector/extension v0.103.0 // indirect go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect @@ -128,3 +129,5 @@ retract ( v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1 v0.69.0 // Release failed, use v0.69.1 ) + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/service/go.mod b/service/go.mod index f5367ba0e72..24d125be540 100644 --- a/service/go.mod +++ b/service/go.mod @@ -84,6 +84,7 @@ require ( go.opentelemetry.io/collector/config/configtls v0.103.0 // indirect go.opentelemetry.io/collector/config/internal v0.103.0 // indirect go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect @@ -146,3 +147,5 @@ replace go.opentelemetry.io/collector/config/internal => ../config/internal replace go.opentelemetry.io/collector/config/configtls => ../config/configtls replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression + +replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile From f47b9f263a8392b3dc4423099718001bb689d676 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Thu, 27 Jun 2024 18:39:09 +0200 Subject: [PATCH 108/168] [exporter/debug] add option `use_internal_logger` (#10227) #### Description Adds a new configuration option `use_internal_logger` to the Debug exporter, that makes it possible to prevent unwanted side effects of the exporter using the collector's internal logger. #### Link to tracking issue Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/10226 #### Testing Updated unit tests to cover the new config option. #### Documentation Added documentation for the feature. --------- Co-authored-by: Yang Song --- .../debug-exporter-use-internal-logger.yaml | 25 ++++++ exporter/debugexporter/README.md | 20 ++++- exporter/debugexporter/config.go | 3 + exporter/debugexporter/exporter_test.go | 90 +++++++++++++------ exporter/debugexporter/factory.go | 41 +++++++-- .../testdata/config_verbosity.yaml | 1 + 6 files changed, 143 insertions(+), 37 deletions(-) create mode 100644 .chloggen/debug-exporter-use-internal-logger.yaml diff --git a/.chloggen/debug-exporter-use-internal-logger.yaml b/.chloggen/debug-exporter-use-internal-logger.yaml new file mode 100644 index 00000000000..df4346e21bb --- /dev/null +++ b/.chloggen/debug-exporter-use-internal-logger.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporter/debug + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add option `use_internal_logger` + +# One or more tracking issues or pull requests related to the change +issues: [10226] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/debugexporter/README.md b/exporter/debugexporter/README.md index f10b6ee8f87..952767663ef 100644 --- a/exporter/debugexporter/README.md +++ b/exporter/debugexporter/README.md @@ -14,7 +14,7 @@ [k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s -Exports data to the console (stderr) via `zap.Logger`. +Outputs telemetry data to the console for debugging purposes. See also the [Troubleshooting][troubleshooting_docs] document for examples on using this exporter. @@ -35,6 +35,7 @@ The following settings are optional: To enable sampling, change `sampling_thereafter` to a value higher than `1`. Refer to [Zap docs](https://godoc.org/go.uber.org/zap/zapcore#NewSampler) for more details on how sampling parameters impact number of messages. +- `use_internal_logger` (default = `true`): uses the collector's internal logger for output. See [below](#using-the-collectors-internal-logger) for description. Example configuration: @@ -120,8 +121,21 @@ Attributes: {"kind": "exporter", "data_type": "traces", "name": "debug"} ``` +## Using the collector's internal logger + +When `use_internal_logger` is set to `true` (the default), the exporter uses the collector's [internal logger][internal_telemetry] for output. +This comes with the following consequences: + +- The output from the exporter may be annotated by additional output from the collector's logger. +- The output from the exporter is affected by the collector's [logging configuration][internal_logs_config] specified in `service::telemetry::logs`. + +When `use_internal_logger` is set to `false`, the exporter does not use the collector's internal logger. +Changing the values in `service::telemetry::logs` has no effect on the exporter's output. +The exporter's output is sent to `stdout`. + +[internal_telemetry]: https://opentelemetry.io/docs/collector/internal-telemetry/ +[internal_logs_config]: https://opentelemetry.io/docs/collector/internal-telemetry/#configure-internal-logs + ## Warnings - Unstable Output Format: The output formats for all verbosity levels is not guaranteed and may be changed at any time without a breaking change. - -[telemetrygen]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/cmd/telemetrygen diff --git a/exporter/debugexporter/config.go b/exporter/debugexporter/config.go index feac8d3c8ff..2ebd85e78ab 100644 --- a/exporter/debugexporter/config.go +++ b/exporter/debugexporter/config.go @@ -30,6 +30,9 @@ type Config struct { // SamplingThereafter defines the sampling rate after the initial samples are logged. SamplingThereafter int `mapstructure:"sampling_thereafter"` + + // UseInternalLogger defines whether the exporter sends the output to the collector's internal logger. + UseInternalLogger bool `mapstructure:"use_internal_logger"` } var _ component.Config = (*Config)(nil) diff --git a/exporter/debugexporter/exporter_test.go b/exporter/debugexporter/exporter_test.go index 4a435339c6f..02e4a2c1827 100644 --- a/exporter/debugexporter/exporter_test.go +++ b/exporter/debugexporter/exporter_test.go @@ -21,39 +21,51 @@ import ( ) func TestTracesExporterNoErrors(t *testing.T) { - lte, err := createTracesExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig()) - require.NotNil(t, lte) - assert.NoError(t, err) - - assert.NoError(t, lte.ConsumeTraces(context.Background(), ptrace.NewTraces())) - assert.NoError(t, lte.ConsumeTraces(context.Background(), testdata.GenerateTraces(10))) - - assert.NoError(t, lte.Shutdown(context.Background())) + for _, tc := range createTestCases() { + t.Run(tc.name, func(t *testing.T) { + lte, err := createTracesExporter(context.Background(), exportertest.NewNopSettings(), tc.config) + require.NotNil(t, lte) + assert.NoError(t, err) + + assert.NoError(t, lte.ConsumeTraces(context.Background(), ptrace.NewTraces())) + assert.NoError(t, lte.ConsumeTraces(context.Background(), testdata.GenerateTraces(10))) + + assert.NoError(t, lte.Shutdown(context.Background())) + }) + } } func TestMetricsExporterNoErrors(t *testing.T) { - lme, err := createMetricsExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig()) - require.NotNil(t, lme) - assert.NoError(t, err) - - assert.NoError(t, lme.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) - assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsAllTypes())) - assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsAllTypesEmpty())) - assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsMetricTypeInvalid())) - assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetrics(10))) - - assert.NoError(t, lme.Shutdown(context.Background())) + for _, tc := range createTestCases() { + t.Run(tc.name, func(t *testing.T) { + lme, err := createMetricsExporter(context.Background(), exportertest.NewNopSettings(), tc.config) + require.NotNil(t, lme) + assert.NoError(t, err) + + assert.NoError(t, lme.ConsumeMetrics(context.Background(), pmetric.NewMetrics())) + assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsAllTypes())) + assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsAllTypesEmpty())) + assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetricsMetricTypeInvalid())) + assert.NoError(t, lme.ConsumeMetrics(context.Background(), testdata.GenerateMetrics(10))) + + assert.NoError(t, lme.Shutdown(context.Background())) + }) + } } func TestLogsExporterNoErrors(t *testing.T) { - lle, err := createLogsExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig()) - require.NotNil(t, lle) - assert.NoError(t, err) - - assert.NoError(t, lle.ConsumeLogs(context.Background(), plog.NewLogs())) - assert.NoError(t, lle.ConsumeLogs(context.Background(), testdata.GenerateLogs(10))) - - assert.NoError(t, lle.Shutdown(context.Background())) + for _, tc := range createTestCases() { + t.Run(tc.name, func(t *testing.T) { + lle, err := createLogsExporter(context.Background(), exportertest.NewNopSettings(), createDefaultConfig()) + require.NotNil(t, lle) + assert.NoError(t, err) + + assert.NoError(t, lle.ConsumeLogs(context.Background(), plog.NewLogs())) + assert.NoError(t, lle.ConsumeLogs(context.Background(), testdata.GenerateLogs(10))) + + assert.NoError(t, lle.Shutdown(context.Background())) + }) + } } func TestExporterErrors(t *testing.T) { @@ -69,6 +81,30 @@ func TestExporterErrors(t *testing.T) { assert.Equal(t, errWant, le.pushLogs(context.Background(), plog.NewLogs())) } +type testCase struct { + name string + config *Config +} + +func createTestCases() []testCase { + return []testCase{ + { + name: "default config", + config: func() *Config { + return createDefaultConfig().(*Config) + }(), + }, + { + name: "don't use internal logger", + config: func() *Config { + cfg := createDefaultConfig().(*Config) + cfg.UseInternalLogger = false + return cfg + }(), + }, + } +} + type errMarshaler struct { err error } diff --git a/exporter/debugexporter/factory.go b/exporter/debugexporter/factory.go index 0d4ee05ae0a..526c01cc5c9 100644 --- a/exporter/debugexporter/factory.go +++ b/exporter/debugexporter/factory.go @@ -43,6 +43,7 @@ func createDefaultConfig() component.Config { Verbosity: configtelemetry.LevelBasic, SamplingInitial: defaultSamplingInitial, SamplingThereafter: defaultSamplingThereafter, + UseInternalLogger: true, } } @@ -83,12 +84,38 @@ func createLogsExporter(ctx context.Context, set exporter.Settings, config compo } func createLogger(cfg *Config, logger *zap.Logger) *zap.Logger { - core := zapcore.NewSamplerWithOptions( - logger.Core(), - 1*time.Second, - cfg.SamplingInitial, - cfg.SamplingThereafter, - ) + var exporterLogger *zap.Logger + if cfg.UseInternalLogger { + core := zapcore.NewSamplerWithOptions( + logger.Core(), + 1*time.Second, + cfg.SamplingInitial, + cfg.SamplingThereafter, + ) + exporterLogger = zap.New(core) + } else { + exporterLogger = createCustomLogger(cfg) + } + return exporterLogger +} - return zap.New(core) +func createCustomLogger(exporterConfig *Config) *zap.Logger { + encoderConfig := zap.NewDevelopmentEncoderConfig() + // Do not prefix the output with log level (`info`) + encoderConfig.LevelKey = "" + // Do not prefix the output with current timestamp. + encoderConfig.TimeKey = "" + zapConfig := zap.Config{ + Level: zap.NewAtomicLevelAt(zap.InfoLevel), + DisableCaller: true, + Sampling: &zap.SamplingConfig{ + Initial: exporterConfig.SamplingInitial, + Thereafter: exporterConfig.SamplingThereafter, + }, + Encoding: "console", + EncoderConfig: encoderConfig, + // Send exporter's output to stdout. This should be made configurable. + OutputPaths: []string{"stdout"}, + } + return zap.Must(zapConfig.Build()) } diff --git a/exporter/debugexporter/testdata/config_verbosity.yaml b/exporter/debugexporter/testdata/config_verbosity.yaml index 4ea62997627..682c45f73d4 100644 --- a/exporter/debugexporter/testdata/config_verbosity.yaml +++ b/exporter/debugexporter/testdata/config_verbosity.yaml @@ -1,3 +1,4 @@ verbosity: detailed sampling_initial: 10 sampling_thereafter: 50 +use_internal_logger: false From fead8fc53090f1383086dfe4d219e44b8c2fa75e Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 27 Jun 2024 18:54:01 +0200 Subject: [PATCH 109/168] [receiver/otlp] Promote `component.UseLocalHostAsDefaultHost` to beta (#10352) #### Description Promotes `component.UseLocalHostAsDefaultHost` feature gate to beta. #### Link to tracking issue Updates #8510 --- ...mx-psi_enable-component-localhost-fgh.yaml | 26 +++++++++++++++++++ config/configgrpc/configgrpc_test.go | 9 +++++++ config/configgrpc/go.mod | 2 +- config/confighttp/confighttp_test.go | 9 +++++++ config/confighttp/go.mod | 2 +- internal/localhostgate/featuregate.go | 6 ++--- otelcol/testdata/otel-log-to-file.yaml | 2 +- receiver/otlpreceiver/config_test.go | 4 +-- 8 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 .chloggen/mx-psi_enable-component-localhost-fgh.yaml diff --git a/.chloggen/mx-psi_enable-component-localhost-fgh.yaml b/.chloggen/mx-psi_enable-component-localhost-fgh.yaml new file mode 100644 index 00000000000..2364449bc8e --- /dev/null +++ b/.chloggen/mx-psi_enable-component-localhost-fgh.yaml @@ -0,0 +1,26 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otlpreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Switch to `localhost` as the default for all endpoints. + +# One or more tracking issues or pull requests related to the change +issues: [8510] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + Disable the `component.UseLocalHostAsDefaultHost` feature gate to temporarily get the previous default. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/config/configgrpc/configgrpc_test.go b/config/configgrpc/configgrpc_test.go index c6009d347f8..010c415a441 100644 --- a/config/configgrpc/configgrpc_test.go +++ b/config/configgrpc/configgrpc_test.go @@ -32,6 +32,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/extension/auth" "go.opentelemetry.io/collector/extension/auth/authtest" + "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/localhostgate" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" ) @@ -437,6 +439,13 @@ func TestUseSecure(t *testing.T) { } func TestGRPCServerWarning(t *testing.T) { + prev := localhostgate.UseLocalHostAsDefaultHostfeatureGate.IsEnabled() + require.NoError(t, featuregate.GlobalRegistry().Set(localhostgate.UseLocalHostAsDefaultHostID, false)) + defer func() { + // Restore previous value. + require.NoError(t, featuregate.GlobalRegistry().Set(localhostgate.UseLocalHostAsDefaultHostID, prev)) + }() + tests := []struct { name string settings ServerConfig diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 82b0d2755d8..0dbc138a4c0 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/configtls v0.103.0 go.opentelemetry.io/collector/config/internal v0.103.0 go.opentelemetry.io/collector/extension/auth v0.103.0 + go.opentelemetry.io/collector/featuregate v1.10.0 go.opentelemetry.io/collector/pdata v1.10.0 go.opentelemetry.io/collector/pdata/testdata v0.103.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 @@ -51,7 +52,6 @@ require ( github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/confmap v0.103.0 // indirect go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/config/confighttp/confighttp_test.go b/config/confighttp/confighttp_test.go index dfce5e97c68..7e984569487 100644 --- a/config/confighttp/confighttp_test.go +++ b/config/confighttp/confighttp_test.go @@ -33,6 +33,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/extension/auth" "go.opentelemetry.io/collector/extension/auth/authtest" + "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/localhostgate" ) type customRoundTripper struct { @@ -515,6 +517,13 @@ func TestHTTPServerSettingsError(t *testing.T) { } func TestHTTPServerWarning(t *testing.T) { + prev := localhostgate.UseLocalHostAsDefaultHostfeatureGate.IsEnabled() + require.NoError(t, featuregate.GlobalRegistry().Set(localhostgate.UseLocalHostAsDefaultHostID, false)) + defer func() { + // Restore previous value. + require.NoError(t, featuregate.GlobalRegistry().Set(localhostgate.UseLocalHostAsDefaultHostID, prev)) + }() + tests := []struct { name string settings ServerConfig diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index cbca50bb8c1..21ba6d3036f 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/config/configtls v0.103.0 go.opentelemetry.io/collector/config/internal v0.103.0 go.opentelemetry.io/collector/extension/auth v0.103.0 + go.opentelemetry.io/collector/featuregate v1.10.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 @@ -46,7 +47,6 @@ require ( github.com/prometheus/procfs v0.15.0 // indirect go.opentelemetry.io/collector/confmap v0.103.0 // indirect go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/collector/pdata v1.10.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/internal/localhostgate/featuregate.go b/internal/localhostgate/featuregate.go index 78c19622967..7c8ee7aeb49 100644 --- a/internal/localhostgate/featuregate.go +++ b/internal/localhostgate/featuregate.go @@ -23,7 +23,7 @@ const UseLocalHostAsDefaultHostID = "component.UseLocalHostAsDefaultHost" var UseLocalHostAsDefaultHostfeatureGate = mustRegisterOrLoad( featuregate.GlobalRegistry(), UseLocalHostAsDefaultHostID, - featuregate.StageAlpha, + featuregate.StageBeta, featuregate.WithRegisterDescription("controls whether server-like receivers and extensions such as the OTLP receiver use localhost as the default host for their endpoints"), ) @@ -60,8 +60,8 @@ func EndpointForPort(port int) string { // LogAboutUseLocalHostAsDefault logs about the upcoming change from 0.0.0.0 to localhost on server-like components. func LogAboutUseLocalHostAsDefault(logger *zap.Logger) { if !UseLocalHostAsDefaultHostfeatureGate.IsEnabled() { - logger.Warn( - "The default endpoints for all servers in components will change to use localhost instead of 0.0.0.0 in a future version. Use the feature gate to preview the new default.", + logger.Info( + "The default endpoints for all servers in components have changed to use localhost instead of 0.0.0.0. Use the feature gate to temporarily revert to the previous default.", zap.String("feature gate ID", UseLocalHostAsDefaultHostID), ) } diff --git a/otelcol/testdata/otel-log-to-file.yaml b/otelcol/testdata/otel-log-to-file.yaml index e618aca22fc..9097c92c94e 100644 --- a/otelcol/testdata/otel-log-to-file.yaml +++ b/otelcol/testdata/otel-log-to-file.yaml @@ -14,7 +14,7 @@ exporters: service: telemetry: logs: - level: warn + level: info output_paths: # The folder need to be created prior to starting the collector - ${ProgramData}\OpenTelemetry\Collector\Logs\otelcol.log diff --git a/receiver/otlpreceiver/config_test.go b/receiver/otlpreceiver/config_test.go index 3059f97471d..bd02edd411e 100644 --- a/receiver/otlpreceiver/config_test.go +++ b/receiver/otlpreceiver/config_test.go @@ -88,7 +88,7 @@ func TestUnmarshalConfig(t *testing.T) { Protocols: Protocols{ GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ - Endpoint: "0.0.0.0:4317", + Endpoint: "localhost:4317", Transport: confignet.TransportTypeTCP, }, TLSSetting: &configtls.ServerConfig{ @@ -117,7 +117,7 @@ func TestUnmarshalConfig(t *testing.T) { }, HTTP: &HTTPConfig{ ServerConfig: &confighttp.ServerConfig{ - Endpoint: "0.0.0.0:4318", + Endpoint: "localhost:4318", TLSSetting: &configtls.ServerConfig{ Config: configtls.Config{ CertFile: "test.crt", From 2a19d55c4c24a3381c2136d1ed91b631da92bbd6 Mon Sep 17 00:00:00 2001 From: Tiffany Hrabusa <30397949+tiffany76@users.noreply.github.com> Date: Fri, 28 Jun 2024 01:25:13 -0700 Subject: [PATCH 110/168] [docs] Clean up internal observability docs (#10454) #### Description Now that [4246](https://github.com/open-telemetry/opentelemetry.io/pull/4246), [4322](https://github.com/open-telemetry/opentelemetry.io/pull/4322), and [4529](https://github.com/open-telemetry/opentelemetry.io/pull/4529) have been merged, and the new [Internal telemetry](https://opentelemetry.io/docs/collector/internal-telemetry/) and [Troubleshooting](https://opentelemetry.io/docs/collector/troubleshooting/) pages are live, it's time to clean up the underlying Collector repo docs so that the website is the single source of truth. I've deleted any content that was moved to the website, and linked to the relevant sections where possible. I've consolidated what content remains in the observability.md file and left troubleshooting.md and monitoring.md as stubs that point to the website. I also searched the Collector repo for cross-references to these files and adjusted links where appropriate. ~~Note that this PR is blocked by [4731](https://github.com/open-telemetry/opentelemetry.io/pull/4731).~~ EDIT: #4731 is merged and no longer a blocker. #### Link to tracking issue Fixes #8886 --- README.md | 2 +- docs/monitoring.md | 71 +------ docs/observability.md | 218 ++++++++++----------- docs/troubleshooting.md | 327 +------------------------------ docs/vision.md | 2 +- exporter/debugexporter/README.md | 2 +- 6 files changed, 115 insertions(+), 507 deletions(-) diff --git a/README.md b/README.md index 0f2b361123c..a42b3a51c29 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@   •   Configuration   •   - Monitoring + Security   •   diff --git a/docs/monitoring.md b/docs/monitoring.md index d50782db712..2de74a6fb23 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -1,70 +1,7 @@ # Monitoring -Many metrics are provided by the Collector for its monitoring. Below some -key recommendations for alerting and monitoring are listed. +To learn how to monitor the Collector using its own telemetry, see the [Internal +telemetry] page. -## Critical Monitoring - -### Data Loss - -Use rate of `otelcol_processor_dropped_spans > 0` and -`otelcol_processor_dropped_metric_points > 0` to detect data loss, depending on -the requirements set up a minimal time window before alerting, avoiding -notifications for small losses that are not considered outages or within the -desired reliability level. - -### Low on CPU Resources - -This depends on the CPU metrics available on the deployment, eg.: -`kube_pod_container_resource_limits{resource="cpu", unit="core"}` for Kubernetes. Let's call it -`available_cores` below. The idea here is to have an upper bound of the number -of available cores, and the maximum expected ingestion rate considered safe, -let's call it `safe_rate`, per core. This should trigger increase of resources/ -instances (or raise an alert as appropriate) whenever -`(actual_rate/available_cores) < safe_rate`. - -The `safe_rate` depends on the specific configuration being used. -// TODO: Provide reference `safe_rate` for a few selected configurations. - -## Secondary Monitoring - -### Queue Length - -Most exporters offer a [queue/retry mechanism](../exporter/exporterhelper/README.md) -that is recommended as the retry mechanism for the Collector and as such should -be used in any production deployment. - -The `otelcol_exporter_queue_capacity` indicates the capacity of the retry queue (in batches). The `otelcol_exporter_queue_size` indicates the current size of retry queue. So you can use these two metrics to check if the queue capacity is enough for your workload. - -The `otelcol_exporter_enqueue_failed_spans`, `otelcol_exporter_enqueue_failed_metric_points` and `otelcol_exporter_enqueue_failed_log_records` indicate the number of span/metric points/log records failed to be added to the sending queue. This may be cause by a queue full of unsettled elements, so you may need to decrease your sending rate or horizontally scale collectors. - -The queue/retry mechanism also supports logging for monitoring. Check -the logs for messages like `"Dropping data because sending_queue is full"`. - -### Receive Failures - -Sustained rates of `otelcol_receiver_refused_spans` and -`otelcol_receiver_refused_metric_points` indicate too many errors returned to -clients. Depending on the deployment and the client’s resilience this may -indicate data loss at the clients. - -Sustained rates of `otelcol_exporter_send_failed_spans` and -`otelcol_exporter_send_failed_metric_points` indicate that the Collector is not -able to export data as expected. -It doesn't imply data loss per se since there could be retries but a high rate -of failures could indicate issues with the network or backend receiving the -data. - -## Data Flow - -### Data Ingress - -The `otelcol_receiver_accepted_spans` and -`otelcol_receiver_accepted_metric_points` metrics provide information about -the data ingested by the Collector. - -### Data Egress - -The `otecol_exporter_sent_spans` and -`otelcol_exporter_sent_metric_points`metrics provide information about -the data exported by the Collector. +[Internal telemetry]: + https://opentelemetry.io/docs/collector/internal-telemetry/#use-internal-telemetry-to-monitor-the-collector diff --git a/docs/observability.md b/docs/observability.md index 78933983217..2086647fdcc 100644 --- a/docs/observability.md +++ b/docs/observability.md @@ -1,140 +1,134 @@ -# OpenTelemetry Collector Observability +# OpenTelemetry Collector internal observability -## Goal +The [Internal telemetry] page on OpenTelemetry's website contains the +documentation for the Collector's internal observability, including: -The goal of this document is to have a comprehensive description of observability of the Collector and changes needed to achieve observability part of our [vision](vision.md). +- Which types of observability are emitted by the Collector. +- How to enable and configure these signals. +- How to use this telemetry to monitor your Collector instance. -## What Needs Observation +If you need to troubleshoot the Collector, see [Troubleshooting]. -The following elements of the Collector need to be observable. +Read on to learn about experimental features and the project's overall vision +for internal telemetry. -### Current Values +## Experimental trace telemetry -- Resource consumption: CPU, RAM (in the future also IO - if we implement persistent queues) and any other metrics that may be available to Go apps (e.g. garbage size, etc). +The Collector does not expose traces by default, but an effort is underway to +[change this][issue7532]. The work includes supporting configuration of the +OpenTelemetry SDK used to produce the Collector's internal telemetry. This +feature is behind two feature gates: -- Receiving data rate, broken down by receivers and by data type (traces/metrics). - -- Exporting data rate, broken down by exporters and by data type (traces/metrics). - -- Data drop rate due to throttling, broken down by data type. - -- Data drop rate due to invalid data received, broken down by data type. - -- Current throttling state: Not Throttled/Throttled by Downstream/Internally Saturated. - -- Incoming connection count, broken down by receiver. - -- Incoming connection rate (new connections per second), broken down by receiver. - -- In-memory queue size (in bytes and in units). Note: measurements in bytes may be difficult / expensive to obtain and should be used cautiously. - -- Persistent queue size (when supported). - -- End-to-end latency (from receiver input to exporter output). Note that with multiple receivers/exporters we potentially have NxM data paths, each with different latency (plus different pipelines in the future), so realistically we should likely expose the average of all data paths (perhaps broken down by pipeline). - -- Latency broken down by pipeline elements (including exporter network roundtrip latency for request/response protocols). - -“Rate” values must reflect the average rate of the last 10 seconds. Rates must exposed in bytes/sec and units/sec (e.g. spans/sec). - -Note: some of the current values and rates may be calculated as derivatives of cumulative values in the backend, so it is an open question if we want to expose them separately or no. - -### Cumulative Values - -- Total received data, broken down by receivers and by data type (traces/metrics). - -- Total exported data, broken down by exporters and by data type (traces/metrics). - -- Total dropped data due to throttling, broken down by data type. - -- Total dropped data due to invalid data received, broken down by data type. - -- Total incoming connection count, broken down by receiver. - -- Uptime since start. - -### Trace or Log on Events - -We want to generate the following events (log and/or send as a trace with additional data): - -- Collector started/stopped. - -- Collector reconfigured (if we support on-the-fly reconfiguration). - -- Begin dropping due to throttling (include throttling reason, e.g. local saturation, downstream saturation, downstream unavailable, etc). - -- Stop dropping due to throttling. - -- Begin dropping due to invalid data (include sample/first invalid data). - -- Stop dropping due to invalid data. - -- Crash detected (differentiate clean stopping and crash, possibly include crash data if available). - -For begin/stop events we need to define an appropriate hysteresis to avoid generating too many events. Note that begin/stop events cannot be detected in the backend simply as derivatives of current rates, the events include additional data that is not present in the current value. +```bash + --feature-gates=telemetry.useOtelWithSDKConfigurationForInternalTelemetry +``` -### Host Metrics +The gate `useOtelWithSDKConfigurationForInternalTelemetry` enables the Collector +to parse any configuration that aligns with the [OpenTelemetry Configuration] +schema. Support for this schema is experimental, but it does allow telemetry to +be exported using OTLP. -The service should collect host resource metrics in addition to service's own process metrics. This may help to understand that the problem that we observe in the service is induced by a different process on the same host. +The following configuration can be used in combination with the aforementioned +feature gates to emit internal metrics and traces from the Collector to an OTLP +backend: -## How We Expose Telemetry +```yaml +service: + telemetry: + metrics: + readers: + - periodic: + interval: 5000 + exporter: + otlp: + protocol: grpc/protobuf + endpoint: https://backend:4317 + traces: + processors: + - batch: + exporter: + otlp: + protocol: grpc/protobuf + endpoint: https://backend2:4317 +``` -By default, the Collector exposes service telemetry in two ways currently: +See the [example configuration][kitchen-sink] for additional options. -- internal metrics are exposed via a Prometheus interface which defaults to port `8888` -- logs are emitted to stdout +> This configuration does not support emitting logs as there is no support for +> [logs] in the OpenTelemetry Go SDK at this time. -Traces are not exposed by default. There is an effort underway to [change this][issue7532]. The work includes supporting -configuration of the OpenTelemetry SDK used to produce the Collector's internal telemetry. This feature is -currently behind two feature gates: +You can also configure the Collector to send its own traces using the OTLP +exporter. Send the traces to an OTLP server running on the same Collector, so it +goes through configured pipelines. For example: -```bash - --feature-gates=telemetry.useOtelWithSDKConfigurationForInternalTelemetry +```yaml +service: + telemetry: + traces: + processors: + batch: + exporter: + otlp: + protocol: grpc/protobuf + endpoint: ${MY_POD_IP}:4317 ``` -The gate `useOtelWithSDKConfigurationForInternalTelemetry` enables the Collector to parse configuration -that aligns with the [OpenTelemetry Configuration] schema. The support for this schema is still -experimental, but it does allow telemetry to be exported via OTLP. +## Goals of internal telemetry -The following configuration can be used in combination with the feature gates aforementioned -to emit internal metrics and traces from the Collector to an OTLP backend: +The Collector's internal telemetry is an important part of fulfilling +OpenTelemetry's [project vision](vision.md). The following section explains the +priorities for making the Collector an observable service. -```yaml -service: - telemetry: - metrics: - readers: - - periodic: - interval: 5000 - exporter: - otlp: - protocol: grpc/protobuf - endpoint: https://backend:4317 - traces: - processors: - - batch: - exporter: - otlp: - protocol: grpc/protobuf - endpoint: https://backend2:4317 -``` +### Observable elements -See the configuration's [example][kitchen-sink] for additional configuration options. +The following aspects of the Collector need to be observable. -Note that this configuration does not support emitting logs as there is no support for [logs] in -OpenTelemetry Go SDK at this time. +- [Current values] + - Some of the current values and rates might be calculated as derivatives of + cumulative values in the backend, so it's an open question whether to expose + them separately or not. +- [Cumulative values] +- [Trace or log events] + - For start or stop events, an appropriate hysteresis must be defined to avoid + generating too many events. Note that start and stop events can't be + detected in the backend simply as derivatives of current rates. The events + include additional data that is not present in the current value. +- [Host metrics] + - Host metrics can help users determine if the observed problem in a service + is caused by a different process on the same host. ### Impact -We need to be able to assess the impact of these observability improvements on the core performance of the Collector. +The impact of these observability improvements on the core performance of the +Collector must be assessed. -### Configurable Level of Observability +### Configurable level of observability -Some of the metrics/traces can be high volume and may not be desirable to always observe. We should consider adding an observability verboseness “level” that allows configuring the Collector to send more or less observability data (or even finer granularity to allow turning on/off specific metrics). +Some metrics and traces can be high volume and users might not always want to +observe them. An observability verboseness “level” allows configuration of the +Collector to send more or less observability data or with even finer +granularity, to allow turning on or off specific metrics. -The default level of observability must be defined in a way that has insignificant performance impact on the service. +The default level of observability must be defined in a way that has +insignificant performance impact on the service. -[issue7532]: https://github.com/open-telemetry/opentelemetry-collector/issues/7532 -[issue7454]: https://github.com/open-telemetry/opentelemetry-collector/issues/7454 +[Internal telemetry]: + https://opentelemetry.io/docs/collector/internal-telemetry/ +[Troubleshooting]: https://opentelemetry.io/docs/collector/troubleshooting/ +[issue7532]: + https://github.com/open-telemetry/opentelemetry-collector/issues/7532 +[issue7454]: + https://github.com/open-telemetry/opentelemetry-collector/issues/7454 [logs]: https://github.com/open-telemetry/opentelemetry-go/issues/3827 -[OpenTelemetry Configuration]: https://github.com/open-telemetry/opentelemetry-configuration -[kitchen-sink]: https://github.com/open-telemetry/opentelemetry-configuration/blob/main/examples/kitchen-sink.yaml +[OpenTelemetry Configuration]: + https://github.com/open-telemetry/opentelemetry-configuration +[kitchen-sink]: + https://github.com/open-telemetry/opentelemetry-configuration/blob/main/examples/kitchen-sink.yaml +[Current values]: + https://opentelemetry.io/docs/collector/internal-telemetry/#values-observable-with-internal-metrics +[Cumulative values]: + https://opentelemetry.io/docs/collector/internal-telemetry/#values-observable-with-internal-metrics +[Trace or log events]: + https://opentelemetry.io/docs/collector/internal-telemetry/#events-observable-with-internal-logs +[Host metrics]: + https://opentelemetry.io/docs/collector/internal-telemetry/#lists-of-internal-metrics diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index c44f3422402..7b10c9050a2 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -1,328 +1,5 @@ # Troubleshooting -## Observability +To troubleshoot the Collector, see the [Troubleshooting] page. -The Collector offers multiple ways to measure the health of the Collector -as well as investigate issues. - -### Logs - -Logs can be helpful in identifying issues. Always start by checking the log -output and looking for potential issues. -The verbosity level defaults to `INFO` and can be adjusted. - -Set the log level in the config `service::telemetry::logs` - -```yaml -service: - telemetry: - logs: - level: "debug" -``` - -### Metrics - -Prometheus metrics are exposed locally on port `8888` and path `/metrics`. For -containerized environments it may be desirable to expose this port on a -public interface instead of just locally. - -Set the address in the config `service::telemetry::metrics` - -```yaml -service: - telemetry: - metrics: - address: ":8888" -``` - -A Grafana dashboard for these metrics can be found -[here](https://grafana.com/grafana/dashboards/15983-opentelemetry-collector/). - -You can enhance metrics telemetry level using `level` field. The following is a list of all possible values and their explanations. - -- "none" indicates that no telemetry data should be collected; -- "basic" is the recommended and covers the basics of the service telemetry. -- "normal" adds some other indicators on top of basic. -- "detailed" adds dimensions and views to the previous levels. - -For example: -```yaml -service: - telemetry: - metrics: - level: detailed - address: ":8888" -``` - -Also note that a Collector can be configured to scrape its own metrics and send -it through configured pipelines. For example: - -```yaml -receivers: - prometheus: - config: - scrape_configs: - - job_name: 'otelcol' - scrape_interval: 10s - static_configs: - - targets: ['0.0.0.0:8888'] - metric_relabel_configs: - - source_labels: [ __name__ ] - regex: '.*grpc_io.*' - action: drop -exporters: - debug: -service: - pipelines: - metrics: - receivers: [prometheus] - processors: [] - exporters: [debug] -``` - -### Traces - -OpenTelemetry Collector has an ability to send it's own traces using OTLP exporter. You can send the traces to OTLP server running on the same OpenTelemetry Collector, so it goes through configured pipelines. For example: - -```yaml -service: - telemetry: - traces: - processors: - batch: - exporter: - otlp: - protocol: grpc/protobuf - endpoint: ${MY_POD_IP}:4317 -``` - -### zPages - -The -[zpages](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/zpagesextension/README.md) -extension, which if enabled is exposed locally on port `55679`, can be used to -check receivers and exporters trace operations via `/debug/tracez`. `zpages` -may contain error logs that the Collector does not emit. - -For containerized environments it may be desirable to expose this port on a -public interface instead of just locally. This can be configured via the -extensions configuration section. For example: - -```yaml -extensions: - zpages: - endpoint: 0.0.0.0:55679 -``` - -### Local exporters - -[Local -exporters](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter#general-information) -can be configured to inspect the data being processed by the Collector. - -For live troubleshooting purposes consider leveraging the `debug` exporter, -which can be used to confirm that data is being received, processed and -exported by the Collector. - -```yaml -receivers: - zipkin: -exporters: - debug: -service: - pipelines: - traces: - receivers: [zipkin] - processors: [] - exporters: [debug] -``` - -Get a Zipkin payload to test. For example create a file called `trace.json` -that contains: - -```json -[ - { - "traceId": "5982fe77008310cc80f1da5e10147519", - "parentId": "90394f6bcffb5d13", - "id": "67fae42571535f60", - "kind": "SERVER", - "name": "/m/n/2.6.1", - "timestamp": 1516781775726000, - "duration": 26000, - "localEndpoint": { - "serviceName": "api" - }, - "remoteEndpoint": { - "serviceName": "apip" - }, - "tags": { - "data.http_response_code": "201" - } - } -] -``` - -With the Collector running, send this payload to the Collector. For example: - -```console -$ curl -X POST localhost:9411/api/v2/spans -H'Content-Type: application/json' -d @trace.json -``` - -You should see a log entry like the following from the Collector: - -``` -2023-09-07T09:57:43.468-0700 info TracesExporter {"kind": "exporter", "data_type": "traces", "name": "debug", "resource spans": 1, "spans": 2} -``` - -You can also configure the `debug` exporter so the entire payload is printed: - -```yaml -exporters: - debug: - verbosity: detailed -``` - -With the modified configuration if you re-run the test above the log output should look like: - -``` -2023-09-07T09:57:12.820-0700 info TracesExporter {"kind": "exporter", "data_type": "traces", "name": "debug", "resource spans": 1, "spans": 2} -2023-09-07T09:57:12.821-0700 info ResourceSpans #0 -Resource SchemaURL: https://opentelemetry.io/schemas/1.4.0 -Resource attributes: - -> service.name: Str(telemetrygen) -ScopeSpans #0 -ScopeSpans SchemaURL: -InstrumentationScope telemetrygen -Span #0 - Trace ID : 0c636f29e29816ea76e6a5b8cd6601cf - Parent ID : 1a08eba9395c5243 - ID : 10cebe4b63d47cae - Name : okey-dokey - Kind : Internal - Start time : 2023-09-07 16:57:12.045933 +0000 UTC - End time : 2023-09-07 16:57:12.046058 +0000 UTC - Status code : Unset - Status message : -Attributes: - -> span.kind: Str(server) - -> net.peer.ip: Str(1.2.3.4) - -> peer.service: Str(telemetrygen) -``` - -### Health Check - -The -[health_check](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/healthcheckextension/README.md) -extension, which by default is available on all interfaces on port `13133`, can -be used to ensure the Collector is functioning properly. - -```yaml -extensions: - health_check: -service: - extensions: [health_check] -``` - -It returns a response like the following: - -```json -{ - "status": "Server available", - "upSince": "2020-11-11T04:12:31.6847174Z", - "uptime": "49.0132518s" -} -``` - -### pprof - -The -[pprof](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/pprofextension/README.md) -extension, which by default is available locally on port `1777`, allows you to profile the -Collector as it runs. This is an advanced use-case that should not be needed in most circumstances. - -## Common Issues - -To see logs for the Collector: - -On a Linux systemd system, logs can be found using `journalctl`: -`journalctl | grep otelcol` - -or to find only errors: -`journalctl | grep otelcol | grep Error` - -### Collector exit/restart - -The Collector may exit/restart because: - -- Memory pressure due to missing or misconfigured - [memory_limiter](https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiterprocessor/README.md) - processor. -- Improperly sized for load. -- Improperly configured (for example, a queue size configured higher - than available memory). -- Infrastructure resource limits (for example Kubernetes). - -### Data being dropped - -Data may be dropped for a variety of reasons, but most commonly because of an: - -- Improperly sized Collector resulting in Collector being unable to process and export the data as fast as it is received. -- Exporter destination unavailable or accepting the data too slowly. - -To mitigate drops, it is highly recommended to configure the -[batch](https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/batchprocessor/README.md) -processor. In addition, it may be necessary to configure the [queued retry -options](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper#configuration) -on enabled exporters. - -### Receiving data not working - -If you are unable to receive data then this is likely because -either: - -- There is a network configuration issue -- The receiver configuration is incorrect -- The receiver is defined in the `receivers` section, but not enabled in any `pipelines` -- The client configuration is incorrect - -Check the Collector logs as well as `zpages` for potential issues. - -### Processing data not working - -Most processing issues are a result of either a misunderstanding of how the -processor works or a misconfiguration of the processor. - -Examples of misunderstanding include: - -- The attributes processors only work for "tags" on spans. Span name is - handled by the span processor. -- Processors for trace data (except tail sampling) work on individual spans. - -### Exporting data not working - -If you are unable to export to a destination then this is likely because -either: - -- There is a network configuration issue -- The exporter configuration is incorrect -- The destination is unavailable - -Check the collector logs as well as `zpages` for potential issues. - -More often than not, exporting data does not work because of a network -configuration issue. This could be due to a firewall, DNS, or proxy -issue. Note that the Collector does have -[proxy support](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter#proxy-support). - -### Startup failing in Windows Docker containers (v0.90.1 and earlier) - -The process may fail to start in a Windows Docker container with the following -error: `The service process could not connect to the service controller`. In -this case the `NO_WINDOWS_SERVICE=1` environment variable should be set to force -the collector to be started as if it were running in an interactive terminal, -without attempting to run as a Windows service. - -### Null Maps in Configuration - -If you've ever experienced issues during configuration resolution where sections, like `processors:` from earlier configuration are removed, see [confmap](../confmap/README.md#troubleshooting) +[Troubleshooting]: https://opentelemetry.io/docs/collector/troubleshooting/ diff --git a/docs/vision.md b/docs/vision.md index 5b315598d0d..ebb36751870 100644 --- a/docs/vision.md +++ b/docs/vision.md @@ -8,7 +8,7 @@ This is a living document that is expected to evolve over time. Highly stable and performant under varying loads. Well-behaved under extreme load, with predictable, low resource consumption. ## Observable -Expose own operational metrics in a clear way. Be an exemplar of observable service. Allow configuring the level of observability (more or less metrics, traces, logs, etc reported). See [more details](observability.md). +Expose own operational metrics in a clear way. Be an exemplar of observable service. Allow configuring the level of observability (more or less metrics, traces, logs, etc reported). See [more details](https://opentelemetry.io/docs/collector/internal-telemetry/). ## Multi-Data Support traces, metrics, logs and other relevant data types. diff --git a/exporter/debugexporter/README.md b/exporter/debugexporter/README.md index 952767663ef..57237c76972 100644 --- a/exporter/debugexporter/README.md +++ b/exporter/debugexporter/README.md @@ -18,7 +18,7 @@ Outputs telemetry data to the console for debugging purposes. See also the [Troubleshooting][troubleshooting_docs] document for examples on using this exporter. -[troubleshooting_docs]: ../../docs/troubleshooting.md +[troubleshooting_docs]: https://opentelemetry.io/docs/collector/troubleshooting/#local-exporters ## Getting Started From 9524644969edf1e0889688f6211ddc63becfef06 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 28 Jun 2024 01:25:31 -0700 Subject: [PATCH 111/168] [confmap] Move confmap.unifyEnvVarExpansion to beta (#10435) #### Description Moves confmap.unifyEnvVarExpansion to beta. This means the collector will, by default, use the env var provider to expand `${FOO}` synatx and will error if the expandconverter is used to expand `$FOO` syntax. #### Link to tracking issue Related to https://github.com/open-telemetry/opentelemetry-collector/issues/10161 Related to https://github.com/open-telemetry/opentelemetry-collector/issues/8215 Related to https://github.com/open-telemetry/opentelemetry-collector/issues/7111 --------- Co-authored-by: Pablo Baeyens --- ...fmap-unifyEnvVarExpansion-gate-beta-2.yaml | 25 +++++++++++++++++++ ...onfmap-unifyEnvVarExpansion-gate-beta.yaml | 25 +++++++++++++++++++ confmap/converter/expandconverter/expand.go | 3 +-- .../converter/expandconverter/expand_test.go | 7 +++++- internal/featuregates/featuregates.go | 2 +- otelcol/command_test.go | 1 + 6 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 .chloggen/confmap-unifyEnvVarExpansion-gate-beta-2.yaml create mode 100644 .chloggen/confmap-unifyEnvVarExpansion-gate-beta.yaml diff --git a/.chloggen/confmap-unifyEnvVarExpansion-gate-beta-2.yaml b/.chloggen/confmap-unifyEnvVarExpansion-gate-beta-2.yaml new file mode 100644 index 00000000000..82eaabe4c5d --- /dev/null +++ b/.chloggen/confmap-unifyEnvVarExpansion-gate-beta-2.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: By default, `otelcol.NewCommand` and `otelcol.NewCommandMustSetProvider` will set the `DefaultScheme` to `env`. + +# One or more tracking issues or pull requests related to the change +issues: [10435] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/.chloggen/confmap-unifyEnvVarExpansion-gate-beta.yaml b/.chloggen/confmap-unifyEnvVarExpansion-gate-beta.yaml new file mode 100644 index 00000000000..b5320642cc5 --- /dev/null +++ b/.chloggen/confmap-unifyEnvVarExpansion-gate-beta.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: expandconverter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: By default expandconverter will now error if it is about to expand `$FOO` syntax. Update configuration to use `${env:FOO}` instead or disable the feature gate. + +# One or more tracking issues or pull requests related to the change +issues: [10435] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/confmap/converter/expandconverter/expand.go b/confmap/converter/expandconverter/expand.go index 38b84140674..aa18d1a3817 100644 --- a/confmap/converter/expandconverter/expand.go +++ b/confmap/converter/expandconverter/expand.go @@ -5,7 +5,6 @@ package expandconverter // import "go.opentelemetry.io/collector/confmap/convert import ( "context" - "errors" "fmt" "os" "regexp" @@ -95,7 +94,7 @@ func (c converter) expandEnv(s string) (string, error) { var regex = regexp.MustCompile(fmt.Sprintf(`\$%s`, regexp.QuoteMeta(str))) if _, exists := c.loggedDeprecations[str]; !exists && regex.MatchString(s) { if featuregates.UseUnifiedEnvVarExpansionRules.IsEnabled() { - err = errors.New("$VAR expansion is not supported when feature gate confmap.unifyEnvVarExpansion is enabled") + err = fmt.Errorf("variable substitution using $VAR has been deprecated in favor of ${VAR} and ${env:VAR} - please update $%s or temporarily disable the confmap.unifyEnvVarExpansion feature gate", str) return "" } msg := fmt.Sprintf("Variable substitution using $VAR will be deprecated in favor of ${VAR} and ${env:VAR}, please update $%s", str) diff --git a/confmap/converter/expandconverter/expand_test.go b/confmap/converter/expandconverter/expand_test.go index 6cd7fb881ee..ab2fa49c549 100644 --- a/confmap/converter/expandconverter/expand_test.go +++ b/confmap/converter/expandconverter/expand_test.go @@ -48,6 +48,11 @@ func TestNewExpandConverter(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), false)) + t.Cleanup(func() { + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), true)) + }) + conf, err := confmaptest.LoadConf(filepath.Join("testdata", test.name)) require.NoError(t, err, "Unable to get config") @@ -80,7 +85,7 @@ func TestNewExpandConverter_UseUnifiedEnvVarExpansionRules(t *testing.T) { require.NoError(t, err, "Unable to get config") // Test that expanded configs are the same with the simple config with no env vars. - require.ErrorContains(t, createConverter().Convert(context.Background(), conf), "$VAR expansion is not supported when feature gate confmap.unifyEnvVarExpansion is enabled") + require.ErrorContains(t, createConverter().Convert(context.Background(), conf), "variable substitution using $VAR has been deprecated in favor of ${VAR} and ${env:VAR}") } func TestNewExpandConverter_EscapedMaps(t *testing.T) { diff --git a/internal/featuregates/featuregates.go b/internal/featuregates/featuregates.go index da2017f5831..e74c75fe481 100644 --- a/internal/featuregates/featuregates.go +++ b/internal/featuregates/featuregates.go @@ -6,6 +6,6 @@ package featuregates // import "go.opentelemetry.io/collector/internal/featurega import "go.opentelemetry.io/collector/featuregate" var UseUnifiedEnvVarExpansionRules = featuregate.GlobalRegistry().MustRegister("confmap.unifyEnvVarExpansion", - featuregate.StageAlpha, + featuregate.StageBeta, featuregate.WithRegisterFromVersion("v0.103.0"), featuregate.WithRegisterDescription("`${FOO}` will now be expanded as if it was `${env:FOO}` and no longer expands $ENV syntax. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. When this feature gate is stable, expandconverter will be removed.")) diff --git a/otelcol/command_test.go b/otelcol/command_test.go index 388df2591d2..49fc1113970 100644 --- a/otelcol/command_test.go +++ b/otelcol/command_test.go @@ -36,6 +36,7 @@ func TestNewCommandProgrammaticallyPassedConfig(t *testing.T) { cmd := NewCommandMustSetProvider(CollectorSettings{Factories: nopFactories, ConfigProviderSettings: ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ ProviderFactories: []confmap.ProviderFactory{confmap.NewProviderFactory(newFailureProvider)}, + DefaultScheme: "file", }, }}) otelRunE := cmd.RunE From c60fb1dad2a623fb927b235b85113b9db6713b7d Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Fri, 28 Jun 2024 10:25:54 +0200 Subject: [PATCH 112/168] RFC: Experimental profiling (#10375) #### Description This is an RFC discussing the proposed solution for adding the profiling signal. Follows https://github.com/open-telemetry/opentelemetry-collector/issues/10207 PoC: https://github.com/open-telemetry/opentelemetry-collector/pull/10307 cc @open-telemetry/profiling-triagers @open-telemetry/profiling-approvers @open-telemetry/profiling-maintainers cc @open-telemetry/collector-approvers --------- Co-authored-by: Christos Kalkanis Co-authored-by: Pablo Baeyens --- docs/rfcs/experimental-profiling.md | 108 ++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 docs/rfcs/experimental-profiling.md diff --git a/docs/rfcs/experimental-profiling.md b/docs/rfcs/experimental-profiling.md new file mode 100644 index 00000000000..e00ef16c738 --- /dev/null +++ b/docs/rfcs/experimental-profiling.md @@ -0,0 +1,108 @@ +# Experimental support for profiling + +## Overview + +The OpenTelemetry collector has traces, metrics and logs as stable signals. We +want to start experimenting with support for profiles as an experimental +signal. But we also don't want to introduce breaking changes in packages +otherwise considered stable. + +This document describes: + +* The approach we intend to take to introduce profiling with no breaking changes +* How the migration will happen once profiling goes stable + +### Discarded approaches + +#### Refactor everything into per-signal subpackages + +A first approach, discussed in [issue +10207](https://github.com/open-telemetry/opentelemetry-collector/issues/10207) +has been discarded. +It aimed to refactor the current packages with per-signal subpackages, so each +subpackage could have its own stability level, like pdata does. + +This has been discarded, as the Collector SIG does not want the profiling +signal to impact the road to the collector reaching 1.0. + +#### Use build tags + +An approach would have been to use build tags to limit the availability of +profiles within packages. + +This approach would make the UX very bad though, as most packages are meant to +be imported and not used in a compiled collector. It would therefore not have +been possible to specify the appropriate build tags. + +This has been discarded, as the usage would have been too difficult. + +## Proposed approach + +The proposed approach will consist of two main phases: + +* Introduce `experimental` packages for each required module of the collector that needs to be profiles-aware. + * `consumer`, `receiver`, `connector`, `component`, `processor` +* Mark specific APIs as `experimental` in their godoc for parts that can't be a new package. + * `service` + +### Introduce "experimental" subpackages + +Each package that needs to be profiling signal-aware will have its public +methods and interfaces moves into an internal subpackage. + +Then, the original package will get similar API methods and interfaces as the +ones currently available on the main branch. + +The profiling methods and interfaces will be made available in a `profiles` +subpackage. + +See [PR +#10253](https://github.com/open-telemetry/opentelemetry-collector/pull/10253) +for an example. + +### Mark specific APIs as `experimental` + +In order to boot a functional collector with profiles support, some stable +packages need to be aware of the experimental ones. + +To support that case, we will mark new APIs as `experimental` with go docs. +Every experimental API will be documented as such: + +```golang +// # Experimental +// +// Notice: This method is EXPERIMENTAL and may be changed or removed in a +// later release. +``` + +As documented, APIs marked as experimental may changed or removed across +releases, without it being considered as a breaking change. + +There are no symbols that would need to be marked as experimental today. If +there ever are then implementers may add an experimental comment to them + +#### User specified configuration + +The user-specified configuration will let users specify a `profiles` pipeline: + +``` +service: + pipelines: + profiles: + receivers: [otlp] + processors: [batch] + exporters: [otlp] +``` + +When an experimental signal is being used, the collector will log a warning at +boot. + +## Signal status change + +If the profiling signal becomes stable, all the experimental packages will be +merged back into their stable counterpart, and the `service` module's imports +will be updated. + +If the profiling signal is removed, all the experimental packages will be +removed from the repository, and support for them will be removed in the +`service` module. From 5309d60a167b7e86e346f8abb845e2cb68c5ed35 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 28 Jun 2024 01:33:11 -0700 Subject: [PATCH 113/168] [otelcol] Remove all default providers/converters (#10436) #### Description Removed deprecated `NewCommand`. Deprecates `NewCommandMustSetProvider`. Adds `NewCommand` that requires at least one provider be set. Removes usage of imported providers/converters from otelcol (but they still live in otelcoltest until https://github.com/open-telemetry/opentelemetry-collector/pull/10417 is merged. #### Link to tracking issue closes https://github.com/open-telemetry/opentelemetry-collector/issues/10290. #### Testing Unit tests --- .chloggen/otelcol-update-commane-2.yaml | 25 +++++ .chloggen/otelcol-update-commane.yaml | 25 +++++ cmd/builder/internal/builder/main_test.go | 14 +++ otelcol/collector_test.go | 122 +++++++++++++++++++--- otelcol/collector_windows.go | 2 +- otelcol/collector_windows_test.go | 5 +- otelcol/command.go | 43 +++----- otelcol/command_components_test.go | 4 +- otelcol/command_test.go | 63 +++++------ otelcol/command_validate.go | 4 +- otelcol/command_validate_test.go | 16 +-- otelcol/configprovider.go | 22 ---- otelcol/configprovider_test.go | 23 +++- otelcol/go.mod | 18 ---- otelcol/otelcoltest/go.mod | 3 - 15 files changed, 249 insertions(+), 140 deletions(-) create mode 100644 .chloggen/otelcol-update-commane-2.yaml create mode 100644 .chloggen/otelcol-update-commane.yaml diff --git a/.chloggen/otelcol-update-commane-2.yaml b/.chloggen/otelcol-update-commane-2.yaml new file mode 100644 index 00000000000..4c799647a18 --- /dev/null +++ b/.chloggen/otelcol-update-commane-2.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: The `otelcol.NewCommandMustSetProvider` is deprecated. Use `otelcol.NewCommand` instead. + +# One or more tracking issues or pull requests related to the change +issues: [10436] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/.chloggen/otelcol-update-commane.yaml b/.chloggen/otelcol-update-commane.yaml new file mode 100644 index 00000000000..8a5ba5b9724 --- /dev/null +++ b/.chloggen/otelcol-update-commane.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: The `otelcol.NewCommand` now requires at least one provider be set. + +# One or more tracking issues or pull requests related to the change +issues: [10436] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index ea39bcf785c..91c70f9845f 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -259,6 +259,8 @@ func TestGenerateAndCompile(t *testing.T) { testCase: "Default Configuration Compilation", cfgBuilder: func(t *testing.T) Config { cfg := newTestConfig() + err := cfg.SetBackwardsCompatibility() + require.NoError(t, err) cfg.Distribution.OutputPath = t.TempDir() cfg.Replaces = append(cfg.Replaces, replaces...) return cfg @@ -268,6 +270,8 @@ func TestGenerateAndCompile(t *testing.T) { testCase: "LDFlags Compilation", cfgBuilder: func(t *testing.T) Config { cfg := newTestConfig() + err := cfg.SetBackwardsCompatibility() + require.NoError(t, err) cfg.Distribution.OutputPath = t.TempDir() cfg.Replaces = append(cfg.Replaces, replaces...) cfg.LDFlags = `-X "test.gitVersion=0743dc6c6411272b98494a9b32a63378e84c34da" -X "test.gitTag=local-testing" -X "test.goVersion=go version go1.20.7 darwin/amd64"` @@ -278,6 +282,8 @@ func TestGenerateAndCompile(t *testing.T) { testCase: "Debug Compilation", cfgBuilder: func(t *testing.T) Config { cfg := newTestConfig() + err := cfg.SetBackwardsCompatibility() + require.NoError(t, err) cfg.Distribution.OutputPath = t.TempDir() cfg.Replaces = append(cfg.Replaces, replaces...) cfg.Logger = zap.NewNop() @@ -289,6 +295,8 @@ func TestGenerateAndCompile(t *testing.T) { testCase: "No providers", cfgBuilder: func(t *testing.T) Config { cfg := newTestConfig() + err := cfg.SetBackwardsCompatibility() + require.NoError(t, err) cfg.Distribution.OutputPath = t.TempDir() cfg.Replaces = append(cfg.Replaces, replaces...) cfg.Providers = &[]Module{} @@ -299,6 +307,8 @@ func TestGenerateAndCompile(t *testing.T) { testCase: "Pre-confmap factories", cfgBuilder: func(t *testing.T) Config { cfg := newTestConfig() + err := cfg.SetBackwardsCompatibility() + require.NoError(t, err) cfg.Distribution.OutputPath = t.TempDir() cfg.Replaces = append(cfg.Replaces, replaces...) cfg.Distribution.OtelColVersion = "0.98.0" @@ -310,6 +320,8 @@ func TestGenerateAndCompile(t *testing.T) { testCase: "With confmap factories", cfgBuilder: func(t *testing.T) Config { cfg := newTestConfig() + err := cfg.SetBackwardsCompatibility() + require.NoError(t, err) cfg.Distribution.OutputPath = t.TempDir() cfg.Replaces = append(cfg.Replaces, replaces...) cfg.Distribution.OtelColVersion = "0.99.0" @@ -321,6 +333,8 @@ func TestGenerateAndCompile(t *testing.T) { testCase: "ConfResolverDefaultURIScheme set", cfgBuilder: func(t *testing.T) Config { cfg := newTestConfig() + err := cfg.SetBackwardsCompatibility() + require.NoError(t, err) cfg.ConfResolver = ConfResolver{ DefaultURIScheme: "env", } diff --git a/otelcol/collector_test.go b/otelcol/collector_test.go index 68eb3b54318..e1a2356a553 100644 --- a/otelcol/collector_test.go +++ b/otelcol/collector_test.go @@ -7,6 +7,7 @@ package otelcol import ( "context" "errors" + "os" "path/filepath" "sync" "syscall" @@ -15,6 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/zap" + "gopkg.in/yaml.v3" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" @@ -34,7 +37,7 @@ func TestCollectorStartAsGoRoutine(t *testing.T) { set := CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}), } col, err := NewCollector(set) require.NoError(t, err) @@ -55,7 +58,7 @@ func TestCollectorCancelContext(t *testing.T) { set := CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}), } col, err := NewCollector(set) require.NoError(t, err) @@ -87,10 +90,10 @@ func TestCollectorStateAfterConfigChange(t *testing.T) { BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, // this will be overwritten, but we need something to get past validation - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}), }) require.NoError(t, err) - provider, err := NewConfigProvider(newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")})) + provider, err := NewConfigProvider(newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")})) require.NoError(t, err) col.configProvider = &mockCfgProvider{ConfigProvider: provider, watcher: watcher} @@ -116,7 +119,7 @@ func TestCollectorReportError(t *testing.T) { col, err := NewCollector(CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}), }) require.NoError(t, err) @@ -162,7 +165,7 @@ func TestComponentStatusWatcher(t *testing.T) { col, err := NewCollector(CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: func() (Factories, error) { return factories, nil }, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-statuswatcher.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-statuswatcher.yaml")}), }) require.NoError(t, err) @@ -225,7 +228,7 @@ func TestCollectorSendSignal(t *testing.T) { col, err := NewCollector(CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}), }) require.NoError(t, err) @@ -253,7 +256,7 @@ func TestCollectorFailedShutdown(t *testing.T) { col, err := NewCollector(CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}), }) require.NoError(t, err) @@ -278,7 +281,7 @@ func TestCollectorStartInvalidConfig(t *testing.T) { col, err := NewCollector(CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-invalid.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-invalid.yaml")}), }) require.NoError(t, err) assert.Error(t, col.Run(context.Background())) @@ -294,7 +297,7 @@ func TestNewCollectorInvalidConfigProviderSettings(t *testing.T) { } func TestNewCollectorUseConfig(t *testing.T) { - set := newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}) + set := newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}) col, err := NewCollector(CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), @@ -335,7 +338,7 @@ func TestCollectorStartWithTraceContextPropagation(t *testing.T) { set := CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", tt.file)}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", tt.file)}), } col, err := NewCollector(set) @@ -367,7 +370,7 @@ func TestCollectorRun(t *testing.T) { set := CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", tt.file)}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", tt.file)}), } col, err := NewCollector(set) require.NoError(t, err) @@ -385,7 +388,7 @@ func TestCollectorShutdownBeforeRun(t *testing.T) { set := CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}), } col, err := NewCollector(set) require.NoError(t, err) @@ -405,7 +408,7 @@ func TestCollectorClosedStateOnStartUpError(t *testing.T) { set := CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-invalid.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-invalid.yaml")}), } col, err := NewCollector(set) require.NoError(t, err) @@ -426,7 +429,7 @@ func TestCollectorDryRun(t *testing.T) { settings: CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-invalid.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-invalid.yaml")}), }, expectedErr: `service::pipelines::traces: references processor "invalid" which is not configured`, }, @@ -492,3 +495,92 @@ func (*failureProvider) Scheme() string { func (*failureProvider) Shutdown(context.Context) error { return nil } + +type fakeProvider struct { + scheme string + ret func(ctx context.Context, uri string, watcher confmap.WatcherFunc) (*confmap.Retrieved, error) + logger *zap.Logger +} + +func (f *fakeProvider) Retrieve(ctx context.Context, uri string, watcher confmap.WatcherFunc) (*confmap.Retrieved, error) { + return f.ret(ctx, uri, watcher) +} + +func (f *fakeProvider) Scheme() string { + return f.scheme +} + +func (f *fakeProvider) Shutdown(context.Context) error { + return nil +} + +func newFakeProvider(scheme string, ret func(ctx context.Context, uri string, watcher confmap.WatcherFunc) (*confmap.Retrieved, error)) confmap.ProviderFactory { + return confmap.NewProviderFactory(func(ps confmap.ProviderSettings) confmap.Provider { + return &fakeProvider{ + scheme: scheme, + ret: ret, + logger: ps.Logger, + } + }) +} + +func newEnvProvider() confmap.ProviderFactory { + return newFakeProvider("env", func(_ context.Context, uri string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + // When using `env` as the default scheme for tests, the uri will not include `env:`. + // Instead of duplicating the switch cases, the scheme is added instead. + if uri[0:4] != "env:" { + uri = "env:" + uri + } + switch uri { + case "env:COMPLEX_VALUE": + return confmap.NewRetrieved([]any{"localhost:3042"}) + case "env:HOST": + return confmap.NewRetrieved("localhost") + case "env:OS": + return confmap.NewRetrieved("ubuntu") + case "env:PR": + return confmap.NewRetrieved("amd") + case "env:PORT": + return confmap.NewRetrieved(3044) + case "env:INT": + return confmap.NewRetrieved(1) + case "env:INT32": + return confmap.NewRetrieved(32) + case "env:INT64": + return confmap.NewRetrieved(64) + case "env:FLOAT32": + return confmap.NewRetrieved(float32(3.25)) + case "env:FLOAT64": + return confmap.NewRetrieved(float64(6.4)) + case "env:BOOL": + return confmap.NewRetrieved(true) + } + return nil, errors.New("impossible") + }) +} + +func newDefaultConfigProviderSettings(t testing.TB, uris []string) ConfigProviderSettings { + fileProvider := newFakeProvider("file", func(_ context.Context, uri string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + return confmap.NewRetrieved(newConfFromFile(t, uri[5:])) + }) + return ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + URIs: uris, + ProviderFactories: []confmap.ProviderFactory{ + fileProvider, + newEnvProvider(), + }, + }, + } +} + +// newConfFromFile creates a new Conf by reading the given file. +func newConfFromFile(t testing.TB, fileName string) map[string]any { + content, err := os.ReadFile(filepath.Clean(fileName)) + require.NoErrorf(t, err, "unable to read the file %v", fileName) + + var data map[string]any + require.NoError(t, yaml.Unmarshal(content, &data), "unable to parse yaml") + + return confmap.NewFromStringMap(data).ToStringMap() +} diff --git a/otelcol/collector_windows.go b/otelcol/collector_windows.go index 142c811eecc..3df08386bbf 100644 --- a/otelcol/collector_windows.go +++ b/otelcol/collector_windows.go @@ -83,7 +83,7 @@ func (s *windowsService) start(elog *eventlog.Log, colErrorChannel chan error) e } var err error - err = updateSettingsUsingFlags(&s.settings, s.flags, false) + err = updateSettingsUsingFlags(&s.settings, s.flags) if err != nil { return err } diff --git a/otelcol/collector_windows_test.go b/otelcol/collector_windows_test.go index f562c02db4c..698632b43b1 100644 --- a/otelcol/collector_windows_test.go +++ b/otelcol/collector_windows_test.go @@ -19,9 +19,10 @@ import ( func TestNewSvcHandler(t *testing.T) { oldArgs := os.Args defer func() { os.Args = oldArgs }() - os.Args = []string{"otelcol", "--config", filepath.Join("testdata", "otelcol-nop.yaml")} + filePath := filepath.Join("testdata", "otelcol-nop.yaml") + os.Args = []string{"otelcol", "--config", filePath} - s := NewSvcHandler(CollectorSettings{BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories}) + s := NewSvcHandler(CollectorSettings{BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filePath})}) colDone := make(chan struct{}) requests := make(chan svc.ChangeRequest) diff --git a/otelcol/command.go b/otelcol/command.go index cd0ee98e7be..8516ec831ff 100644 --- a/otelcol/command.go +++ b/otelcol/command.go @@ -17,29 +17,15 @@ import ( // Any URIs specified in CollectorSettings.ConfigProviderSettings.ResolverSettings.URIs // are considered defaults and will be overwritten by config flags passed as // command-line arguments to the executable. -// -// Deprecated: [v0.103.0] use NewCommandMustSetProvider instead +// At least one Provider must be set. func NewCommand(set CollectorSettings) *cobra.Command { - return commandHelper(set, false) -} - -// NewCommandMustSetProvider constructs a new cobra.Command using the given CollectorSettings. -// Any URIs specified in CollectorSettings.ConfigProviderSettings.ResolverSettings.URIs -// are considered defaults and will be overwritten by config flags passed as -// command-line arguments to the executable. -// At least one Provider must be supplied via CollectorSettings.ConfigProviderSettings.ResolverSettings.ProviderFactories. -func NewCommandMustSetProvider(set CollectorSettings) *cobra.Command { - return commandHelper(set, true) -} - -func commandHelper(set CollectorSettings, enforceProviders bool) *cobra.Command { flagSet := flags(featuregate.GlobalRegistry()) rootCmd := &cobra.Command{ Use: set.BuildInfo.Command, Version: set.BuildInfo.Version, SilenceUsage: true, RunE: func(cmd *cobra.Command, _ []string) error { - err := updateSettingsUsingFlags(&set, flagSet, enforceProviders) + err := updateSettingsUsingFlags(&set, flagSet) if err != nil { return err } @@ -52,13 +38,24 @@ func commandHelper(set CollectorSettings, enforceProviders bool) *cobra.Command }, } rootCmd.AddCommand(newComponentsCommand(set)) - rootCmd.AddCommand(newValidateSubCommand(set, flagSet, enforceProviders)) + rootCmd.AddCommand(newValidateSubCommand(set, flagSet)) rootCmd.Flags().AddGoFlagSet(flagSet) return rootCmd } +// NewCommandMustSetProvider constructs a new cobra.Command using the given CollectorSettings. +// Any URIs specified in CollectorSettings.ConfigProviderSettings.ResolverSettings.URIs +// are considered defaults and will be overwritten by config flags passed as +// command-line arguments to the executable. +// At least one Provider must be supplied via CollectorSettings.ConfigProviderSettings.ResolverSettings.ProviderFactories. +// +// Deprecated: [v0.104.0] use NewCommand instead +func NewCommandMustSetProvider(set CollectorSettings) *cobra.Command { + return NewCommand(set) +} + // Puts command line flags from flags into the CollectorSettings, to be used during config resolution. -func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet, enforceProviders bool) error { +func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet) error { resolverSet := &set.ConfigProviderSettings.ResolverSettings configFlags := getConfigFlag(flags) @@ -73,14 +70,8 @@ func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet, enfor set.ConfigProviderSettings.ResolverSettings.DefaultScheme = "env" } - // Provide a default set of providers and converters if none have been specified. - // TODO: Remove this after CollectorSettings.ConfigProvider is removed and instead - // do it in the builder. - if len(resolverSet.ProviderFactories) == 0 && len(resolverSet.ConverterFactories) == 0 { - if enforceProviders { - return errors.New("at least one Provider must be supplied") - } - set.ConfigProviderSettings = newDefaultConfigProviderSettings(resolverSet.URIs) + if len(resolverSet.ProviderFactories) == 0 { + return errors.New("at least one Provider must be supplied") } return nil } diff --git a/otelcol/command_components_test.go b/otelcol/command_components_test.go index 64f310886e9..8609f3ae03a 100644 --- a/otelcol/command_components_test.go +++ b/otelcol/command_components_test.go @@ -20,9 +20,9 @@ func TestNewBuildSubCommand(t *testing.T) { set := CollectorSettings{ BuildInfo: component.NewDefaultBuildInfo(), Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-nop.yaml")}), + ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}), } - cmd := NewCommandMustSetProvider(set) + cmd := NewCommand(set) cmd.SetArgs([]string{"components"}) ExpectedOutput, err := os.ReadFile(filepath.Join("testdata", "components-output.yaml")) diff --git a/otelcol/command_test.go b/otelcol/command_test.go index 49fc1113970..4b4860103c4 100644 --- a/otelcol/command_test.go +++ b/otelcol/command_test.go @@ -4,6 +4,7 @@ package otelcol import ( + "context" "path/filepath" "testing" @@ -13,27 +14,24 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/converter/expandconverter" - "go.opentelemetry.io/collector/confmap/provider/envprovider" - "go.opentelemetry.io/collector/confmap/provider/fileprovider" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/internal/featuregates" ) func TestNewCommandVersion(t *testing.T) { - cmd := NewCommandMustSetProvider(CollectorSettings{BuildInfo: component.BuildInfo{Version: "test_version"}}) + cmd := NewCommand(CollectorSettings{BuildInfo: component.BuildInfo{Version: "test_version"}}) assert.Equal(t, "test_version", cmd.Version) } func TestNewCommandNoConfigURI(t *testing.T) { - cmd := NewCommandMustSetProvider(CollectorSettings{Factories: nopFactories}) + cmd := NewCommand(CollectorSettings{Factories: nopFactories}) require.Error(t, cmd.Execute()) } // This test emulates usage of Collector in Jaeger all-in-one, which // allows running the binary with no explicit configuration. func TestNewCommandProgrammaticallyPassedConfig(t *testing.T) { - cmd := NewCommandMustSetProvider(CollectorSettings{Factories: nopFactories, ConfigProviderSettings: ConfigProviderSettings{ + cmd := NewCommand(CollectorSettings{Factories: nopFactories, ConfigProviderSettings: ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ ProviderFactories: []confmap.ProviderFactory{confmap.NewProviderFactory(newFailureProvider)}, DefaultScheme: "file", @@ -56,12 +54,15 @@ receivers: } func TestAddFlagToSettings(t *testing.T) { + filePath := filepath.Join("testdata", "otelcol-invalid.yaml") + fileProvider := newFakeProvider("file", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + return confmap.NewRetrieved(newConfFromFile(t, filePath)) + }) set := CollectorSettings{ ConfigProviderSettings: ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - URIs: []string{filepath.Join("testdata", "otelcol-invalid.yaml")}, - ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()}, - ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, + URIs: []string{filePath}, + ProviderFactories: []confmap.ProviderFactory{fileProvider}, }, }, } @@ -69,52 +70,37 @@ func TestAddFlagToSettings(t *testing.T) { err := flgs.Parse([]string{"--config=otelcol-nop.yaml"}) require.NoError(t, err) - err = updateSettingsUsingFlags(&set, flgs, false) + err = updateSettingsUsingFlags(&set, flgs) require.NoError(t, err) require.Len(t, set.ConfigProviderSettings.ResolverSettings.URIs, 1) } -func TestAddDefaultConfmapModules(t *testing.T) { - set := CollectorSettings{ - ConfigProviderSettings: ConfigProviderSettings{ - ResolverSettings: confmap.ResolverSettings{}, - }, - } - flgs := flags(featuregate.NewRegistry()) - err := flgs.Parse([]string{"--config=otelcol-nop.yaml"}) - require.NoError(t, err) - - err = updateSettingsUsingFlags(&set, flgs, false) - require.NoError(t, err) - require.Len(t, set.ConfigProviderSettings.ResolverSettings.URIs, 1) - require.Len(t, set.ConfigProviderSettings.ResolverSettings.ConverterFactories, 1) - require.Len(t, set.ConfigProviderSettings.ResolverSettings.ProviderFactories, 5) -} - func TestInvalidCollectorSettings(t *testing.T) { set := CollectorSettings{ ConfigProviderSettings: ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, - URIs: []string{"--config=otelcol-nop.yaml"}, + URIs: []string{"--config=otelcol-nop.yaml"}, }, }, } - cmd := NewCommandMustSetProvider(set) + cmd := NewCommand(set) require.Error(t, cmd.Execute()) } func TestNewCommandInvalidComponent(t *testing.T) { + filePath := filepath.Join("testdata", "otelcol-invalid.yaml") + fileProvider := newFakeProvider("file", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + return confmap.NewRetrieved(newConfFromFile(t, filePath)) + }) set := ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - URIs: []string{filepath.Join("testdata", "otelcol-invalid.yaml")}, - ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()}, - ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, + URIs: []string{filePath}, + ProviderFactories: []confmap.ProviderFactory{fileProvider}, }, } - cmd := NewCommandMustSetProvider(CollectorSettings{Factories: nopFactories, ConfigProviderSettings: set}) + cmd := NewCommand(CollectorSettings{Factories: nopFactories, ConfigProviderSettings: set}) require.Error(t, cmd.Execute()) } @@ -130,7 +116,7 @@ func TestNoProvidersReturnsError(t *testing.T) { err := flgs.Parse([]string{"--config=otelcol-nop.yaml"}) require.NoError(t, err) - err = updateSettingsUsingFlags(&set, flgs, true) + err = updateSettingsUsingFlags(&set, flgs) require.ErrorContains(t, err, "at least one Provider must be supplied") } @@ -157,10 +143,13 @@ func Test_UseUnifiedEnvVarExpansionRules(t *testing.T) { t.Cleanup(func() { require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), false)) }) + fileProvider := newFakeProvider("file", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + return &confmap.Retrieved{}, nil + }) set := CollectorSettings{ ConfigProviderSettings: ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory(), envprovider.NewFactory()}, + ProviderFactories: []confmap.ProviderFactory{fileProvider}, DefaultScheme: tt.input, }, }, @@ -169,7 +158,7 @@ func Test_UseUnifiedEnvVarExpansionRules(t *testing.T) { err := flgs.Parse([]string{"--config=otelcol-nop.yaml"}) require.NoError(t, err) - err = updateSettingsUsingFlags(&set, flgs, true) + err = updateSettingsUsingFlags(&set, flgs) require.NoError(t, err) require.Equal(t, tt.expected, set.ConfigProviderSettings.ResolverSettings.DefaultScheme) }) diff --git a/otelcol/command_validate.go b/otelcol/command_validate.go index d1c78ff2f8a..486bc50e716 100644 --- a/otelcol/command_validate.go +++ b/otelcol/command_validate.go @@ -10,13 +10,13 @@ import ( ) // newValidateSubCommand constructs a new validate sub command using the given CollectorSettings. -func newValidateSubCommand(set CollectorSettings, flagSet *flag.FlagSet, enforceProviders bool) *cobra.Command { +func newValidateSubCommand(set CollectorSettings, flagSet *flag.FlagSet) *cobra.Command { validateCmd := &cobra.Command{ Use: "validate", Short: "Validates the config without running the collector", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, _ []string) error { - if err := updateSettingsUsingFlags(&set, flagSet, enforceProviders); err != nil { + if err := updateSettingsUsingFlags(&set, flagSet); err != nil { return err } col, err := NewCollector(set) diff --git a/otelcol/command_validate_test.go b/otelcol/command_validate_test.go index a8d36eafa15..03f93f51d16 100644 --- a/otelcol/command_validate_test.go +++ b/otelcol/command_validate_test.go @@ -4,32 +4,34 @@ package otelcol import ( + "context" "path/filepath" "testing" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/converter/expandconverter" - "go.opentelemetry.io/collector/confmap/provider/fileprovider" "go.opentelemetry.io/collector/featuregate" ) func TestValidateSubCommandNoConfig(t *testing.T) { - cmd := newValidateSubCommand(CollectorSettings{Factories: nopFactories}, flags(featuregate.GlobalRegistry()), false) + cmd := newValidateSubCommand(CollectorSettings{Factories: nopFactories}, flags(featuregate.GlobalRegistry())) err := cmd.Execute() require.Error(t, err) require.Contains(t, err.Error(), "at least one config flag must be provided") } func TestValidateSubCommandInvalidComponents(t *testing.T) { + filePath := filepath.Join("testdata", "otelcol-invalid-components.yaml") + fileProvider := newFakeProvider("file", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + return confmap.NewRetrieved(newConfFromFile(t, filePath)) + }) cmd := newValidateSubCommand(CollectorSettings{Factories: nopFactories, ConfigProviderSettings: ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - URIs: []string{filepath.Join("testdata", "otelcol-invalid-components.yaml")}, - ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()}, - ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, + URIs: []string{filePath}, + ProviderFactories: []confmap.ProviderFactory{fileProvider}, }, - }}, flags(featuregate.GlobalRegistry()), false) + }}, flags(featuregate.GlobalRegistry())) err := cmd.Execute() require.Error(t, err) require.Contains(t, err.Error(), "unknown type: \"nosuchprocessor\"") diff --git a/otelcol/configprovider.go b/otelcol/configprovider.go index 6360b536509..ea5ab1b2026 100644 --- a/otelcol/configprovider.go +++ b/otelcol/configprovider.go @@ -8,12 +8,6 @@ import ( "fmt" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/converter/expandconverter" - "go.opentelemetry.io/collector/confmap/provider/envprovider" - "go.opentelemetry.io/collector/confmap/provider/fileprovider" - "go.opentelemetry.io/collector/confmap/provider/httpprovider" - "go.opentelemetry.io/collector/confmap/provider/httpsprovider" - "go.opentelemetry.io/collector/confmap/provider/yamlprovider" ) // ConfigProvider provides the service configuration. @@ -130,19 +124,3 @@ func (cm *configProvider) GetConfmap(ctx context.Context) (*confmap.Conf, error) return conf, nil } - -func newDefaultConfigProviderSettings(uris []string) ConfigProviderSettings { - return ConfigProviderSettings{ - ResolverSettings: confmap.ResolverSettings{ - URIs: uris, - ProviderFactories: []confmap.ProviderFactory{ - fileprovider.NewFactory(), - envprovider.NewFactory(), - yamlprovider.NewFactory(), - httpprovider.NewFactory(), - httpsprovider.NewFactory(), - }, - ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, - }, - } -} diff --git a/otelcol/configprovider_test.go b/otelcol/configprovider_test.go index b9ad46cb70d..18c97ea1a94 100644 --- a/otelcol/configprovider_test.go +++ b/otelcol/configprovider_test.go @@ -14,8 +14,6 @@ import ( "gopkg.in/yaml.v3" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/provider/fileprovider" - "go.opentelemetry.io/collector/confmap/provider/yamlprovider" ) func newConfig(yamlBytes []byte, factories Factories) (*Config, error) { @@ -48,10 +46,19 @@ func TestConfigProviderYaml(t *testing.T) { require.NoError(t, err) uriLocation := "yaml:" + string(yamlBytes) + + yamlProvider := newFakeProvider("yaml", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + var rawConf any + if err = yaml.Unmarshal(yamlBytes, &rawConf); err != nil { + return nil, err + } + return confmap.NewRetrieved(rawConf) + }) + set := ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ URIs: []string{uriLocation}, - ProviderFactories: []confmap.ProviderFactory{yamlprovider.NewFactory()}, + ProviderFactories: []confmap.ProviderFactory{yamlProvider}, }, } @@ -72,10 +79,13 @@ func TestConfigProviderYaml(t *testing.T) { func TestConfigProviderFile(t *testing.T) { uriLocation := "file:" + filepath.Join("testdata", "otelcol-nop.yaml") + fileProvider := newFakeProvider("file", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + return confmap.NewRetrieved(newConfFromFile(t, uriLocation[5:])) + }) set := ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ URIs: []string{uriLocation}, - ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()}, + ProviderFactories: []confmap.ProviderFactory{fileProvider}, }, } @@ -99,10 +109,13 @@ func TestConfigProviderFile(t *testing.T) { func TestGetConfmap(t *testing.T) { uriLocation := "file:" + filepath.Join("testdata", "otelcol-nop.yaml") + fileProvider := newFakeProvider("file", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + return confmap.NewRetrieved(newConfFromFile(t, uriLocation[5:])) + }) set := ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ URIs: []string{uriLocation}, - ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()}, + ProviderFactories: []confmap.ProviderFactory{fileProvider}, }, } diff --git a/otelcol/go.mod b/otelcol/go.mod index 29c3cfd6540..3da6c7e9088 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -9,12 +9,6 @@ require ( go.opentelemetry.io/collector/component v0.103.0 go.opentelemetry.io/collector/config/configtelemetry v0.103.0 go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.103.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 go.opentelemetry.io/collector/connector v0.103.0 go.opentelemetry.io/collector/exporter v0.103.0 go.opentelemetry.io/collector/extension v0.103.0 @@ -120,18 +114,6 @@ replace go.opentelemetry.io/collector/exporter => ../exporter replace go.opentelemetry.io/collector/confmap => ../confmap -replace go.opentelemetry.io/collector/confmap/converter/expandconverter => ../confmap/converter/expandconverter - -replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../confmap/provider/envprovider - -replace go.opentelemetry.io/collector/confmap/provider/fileprovider => ../confmap/provider/fileprovider - -replace go.opentelemetry.io/collector/confmap/provider/httpprovider => ../confmap/provider/httpprovider - -replace go.opentelemetry.io/collector/confmap/provider/httpsprovider => ../confmap/provider/httpsprovider - -replace go.opentelemetry.io/collector/confmap/provider/yamlprovider => ../confmap/provider/yamlprovider - replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry replace go.opentelemetry.io/collector/processor => ../processor diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 0a786db0a56..60cb5d4d703 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -61,7 +61,6 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector v0.103.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 // indirect go.opentelemetry.io/collector/consumer v0.103.0 // indirect go.opentelemetry.io/collector/featuregate v1.10.0 // indirect go.opentelemetry.io/collector/pdata v1.10.0 // indirect @@ -139,8 +138,6 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile -replace go.opentelemetry.io/collector/confmap/provider/httpsprovider => ../../confmap/provider/httpsprovider - replace go.opentelemetry.io/collector/connector => ../../connector replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry From ee4eb85f58e9ed6765eb7a5296308408318af671 Mon Sep 17 00:00:00 2001 From: Hajime Terasawa Date: Sat, 29 Jun 2024 04:09:26 +0900 Subject: [PATCH 114/168] [service] fix: use ipv6-aware host and port concatenation function (#10343) #### Description Fixing the bug: the latest version of otel-collector failed to start with ipv6 metrics endpoint service telemetry. This problem began to occur after https://github.com/open-telemetry/opentelemetry-collector/pull/9037 with the feature gate flag enabled was merged. This problem is probably an implementation omission because the enabled codepath, which was originally added by https://github.com/open-telemetry/opentelemetry-collector/pull/7871, is marked as WIP. You can reproduce the issue with the config and the environment variable (`MY_POD_IP=::1`). ```yaml service: telemetry: logs: encoding: json metrics: address: '[${env:MY_POD_IP}]:8888' ``` #### Link to tracking issue Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/10011 --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --- .chloggen/fix_ipv6_too_many_colon.yaml | 20 ++++++++ internal/testutil/testutil.go | 59 +++++++++++++++++++++--- internal/testutil/testutil_test.go | 22 ++++++++- service/internal/proctelemetry/config.go | 3 +- service/service_test.go | 26 +++++++++-- 5 files changed, 116 insertions(+), 14 deletions(-) create mode 100644 .chloggen/fix_ipv6_too_many_colon.yaml diff --git a/.chloggen/fix_ipv6_too_many_colon.yaml b/.chloggen/fix_ipv6_too_many_colon.yaml new file mode 100644 index 00000000000..d62a72dc220 --- /dev/null +++ b/.chloggen/fix_ipv6_too_many_colon.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: service + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fixed a bug that caused otel-collector to fail to start with ipv6 metrics endpoint service telemetry. + +# One or more tracking issues or pull requests related to the change +issues: [10011] + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/internal/testutil/testutil.go b/internal/testutil/testutil.go index b8d9923869c..23f73b06a33 100644 --- a/internal/testutil/testutil.go +++ b/internal/testutil/testutil.go @@ -4,6 +4,7 @@ package testutil // import "go.opentelemetry.io/collector/internal/testutil" import ( + "fmt" "net" "os/exec" "runtime" @@ -31,15 +32,44 @@ func GetAvailableLocalAddress(t testing.TB) string { // which do not show up under the "netstat -ano" but can only be found by // "netsh interface ipv4 show excludedportrange protocol=tcp". We'll use []exclusions to hold those ranges and // retry if the port returned by GetAvailableLocalAddress falls in one of those them. + network := "tcp4" var exclusions []portpair portFound := false if runtime.GOOS == "windows" { - exclusions = getExclusionsList(t) + exclusions = getExclusionsList(network, t) } var endpoint string for !portFound { - endpoint = findAvailableAddress(t) + endpoint = findAvailableAddress(network, t) + _, port, err := net.SplitHostPort(endpoint) + require.NoError(t, err) + portFound = true + if runtime.GOOS == "windows" { + for _, pair := range exclusions { + if port >= pair.first && port <= pair.last { + portFound = false + break + } + } + } + } + + return endpoint +} + +// GetAvailableLocalIPv6Address is IPv6 version of GetAvailableLocalAddress. +func GetAvailableLocalIPv6Address(t testing.TB) string { + network := "tcp6" + var exclusions []portpair + portFound := false + if runtime.GOOS == "windows" { + exclusions = getExclusionsList(network, t) + } + + var endpoint string + for !portFound { + endpoint = findAvailableAddress(network, t) _, port, err := net.SplitHostPort(endpoint) require.NoError(t, err) portFound = true @@ -72,8 +102,17 @@ func GetAvailableLocalAddressPrometheus(t testing.TB) *config.Prometheus { } } -func findAvailableAddress(t testing.TB) string { - ln, err := net.Listen("tcp", "localhost:0") +func findAvailableAddress(network string, t testing.TB) string { + var host string + switch network { + case "tcp", "tcp4": + host = "localhost" + case "tcp6": + host = "[::1]" + } + require.NotZero(t, host, "network must be either of tcp, tcp4 or tcp6") + + ln, err := net.Listen("tcp", fmt.Sprintf("%s:0", host)) require.NoError(t, err, "Failed to get a free local port") // There is a possible race if something else takes this same port before // the test uses it, however, that is unlikely in practice. @@ -84,8 +123,16 @@ func findAvailableAddress(t testing.TB) string { } // Get excluded ports on Windows from the command: netsh interface ipv4 show excludedportrange protocol=tcp -func getExclusionsList(t testing.TB) []portpair { - cmdTCP := exec.Command("netsh", "interface", "ipv4", "show", "excludedportrange", "protocol=tcp") +func getExclusionsList(network string, t testing.TB) []portpair { + var cmdTCP *exec.Cmd + switch network { + case "tcp", "tcp4": + cmdTCP = exec.Command("netsh", "interface", "ipv4", "show", "excludedportrange", "protocol=tcp") + case "tcp6": + cmdTCP = exec.Command("netsh", "interface", "ipv6", "show", "excludedportrange", "protocol=tcp") + } + require.NotZero(t, cmdTCP, "network must be either of tcp, tcp4 or tcp6") + outputTCP, errTCP := cmdTCP.CombinedOutput() require.NoError(t, errTCP) exclusions := createExclusionsList(string(outputTCP), t) diff --git a/internal/testutil/testutil_test.go b/internal/testutil/testutil_test.go index 05b38a1de6a..f8dc5cd5e8a 100644 --- a/internal/testutil/testutil_test.go +++ b/internal/testutil/testutil_test.go @@ -29,14 +29,32 @@ func TestGetAvailableLocalAddress(t *testing.T) { require.Nil(t, ln1) } +func TestGetAvailableLocalIpv6Address(t *testing.T) { + endpoint := GetAvailableLocalIPv6Address(t) + + // Endpoint should be free. + ln0, err := net.Listen("tcp", endpoint) + require.NoError(t, err) + require.NotNil(t, ln0) + t.Cleanup(func() { + assert.NoError(t, ln0.Close()) + }) + + // Ensure that the endpoint wasn't something like ":0" by checking that a + // second listener will fail. + ln1, err := net.Listen("tcp", endpoint) + require.Error(t, err) + require.Nil(t, ln1) +} + func TestCreateExclusionsList(t *testing.T) { // Test two examples of typical output from "netsh interface ipv4 show excludedportrange protocol=tcp" emptyExclusionsText := ` Protocol tcp Port Exclusion Ranges -Start Port End Port ----------- -------- +Start Port End Port +---------- -------- * - Administered port exclusions.` diff --git a/service/internal/proctelemetry/config.go b/service/internal/proctelemetry/config.go index 0a9a8b08d82..1c9ba0b63be 100644 --- a/service/internal/proctelemetry/config.go +++ b/service/internal/proctelemetry/config.go @@ -8,6 +8,7 @@ import ( "encoding/json" "errors" "fmt" + "net" "net/http" "net/url" "os" @@ -175,7 +176,7 @@ func initPrometheusExporter(prometheusConfig *config.Prometheus, asyncErrorChann return nil, nil, fmt.Errorf("error creating otel prometheus exporter: %w", err) } - return exporter, InitPrometheusServer(promRegistry, fmt.Sprintf("%s:%d", *prometheusConfig.Host, *prometheusConfig.Port), asyncErrorChannel), nil + return exporter, InitPrometheusServer(promRegistry, net.JoinHostPort(*prometheusConfig.Host, fmt.Sprintf("%d", *prometheusConfig.Port)), asyncErrorChannel), nil } func initPullExporter(exporter config.MetricExporter, asyncErrorChannel chan error) (sdkmetric.Reader, *http.Server, error) { diff --git a/service/service_test.go b/service/service_test.go index b7faad7a737..b0a952724be 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -7,6 +7,7 @@ import ( "bufio" "context" "errors" + "fmt" "net/http" "strings" "sync" @@ -253,13 +254,16 @@ func TestServiceTelemetryCleanupOnError(t *testing.T) { func TestServiceTelemetry(t *testing.T) { for _, tc := range ownMetricsTestCases() { - t.Run(tc.name, func(t *testing.T) { - testCollectorStartHelper(t, tc) + t.Run(fmt.Sprintf("ipv4_%s", tc.name), func(t *testing.T) { + testCollectorStartHelper(t, tc, "tcp4") + }) + t.Run(fmt.Sprintf("ipv6_%s", tc.name), func(t *testing.T) { + testCollectorStartHelper(t, tc, "tcp6") }) } } -func testCollectorStartHelper(t *testing.T, tc ownMetricsTestCase) { +func testCollectorStartHelper(t *testing.T, tc ownMetricsTestCase, network string) { var once sync.Once loggingHookCalled := false hook := func(zapcore.Entry) error { @@ -269,8 +273,20 @@ func testCollectorStartHelper(t *testing.T, tc ownMetricsTestCase) { return nil } - metricsAddr := testutil.GetAvailableLocalAddress(t) - zpagesAddr := testutil.GetAvailableLocalAddress(t) + var ( + metricsAddr string + zpagesAddr string + ) + switch network { + case "tcp", "tcp4": + metricsAddr = testutil.GetAvailableLocalAddress(t) + zpagesAddr = testutil.GetAvailableLocalAddress(t) + case "tcp6": + metricsAddr = testutil.GetAvailableLocalIPv6Address(t) + zpagesAddr = testutil.GetAvailableLocalIPv6Address(t) + } + require.NotZero(t, metricsAddr, "network must be either of tcp, tcp4 or tcp6") + require.NotZero(t, zpagesAddr, "network must be either of tcp, tcp4 or tcp6") set := newNopSettings() set.BuildInfo = component.BuildInfo{Version: "test version", Command: otelCommand} From fd36d05133d0f090bcf037f5ee7ede7b9c1ca8da Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:04:13 -0700 Subject: [PATCH 115/168] [otlpexporter] support validation for dns:// and dns:/// (#10450) This allows users to continue using the recommended dns://authority/host:port notation when needing to specify a custom authority. Fixes #10449 --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --- .../codeboten_remove-additional-slash.yaml | 25 +++++++++++++++++++ exporter/otlpexporter/config.go | 6 +++-- exporter/otlpexporter/config_test.go | 13 +++++++++- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 .chloggen/codeboten_remove-additional-slash.yaml diff --git a/.chloggen/codeboten_remove-additional-slash.yaml b/.chloggen/codeboten_remove-additional-slash.yaml new file mode 100644 index 00000000000..72fbe623fdb --- /dev/null +++ b/.chloggen/codeboten_remove-additional-slash.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otlpexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Update validation to support both dns:// and dns:/// + +# One or more tracking issues or pull requests related to the change +issues: [10449] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/exporter/otlpexporter/config.go b/exporter/otlpexporter/config.go index 62956f293ed..f1d5b668e54 100644 --- a/exporter/otlpexporter/config.go +++ b/exporter/otlpexporter/config.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "net" + "regexp" "strconv" "strings" @@ -49,8 +50,9 @@ func (c *Config) sanitizedEndpoint() string { return strings.TrimPrefix(c.Endpoint, "http://") case strings.HasPrefix(c.Endpoint, "https://"): return strings.TrimPrefix(c.Endpoint, "https://") - case strings.HasPrefix(c.Endpoint, "dns:///"): - return strings.TrimPrefix(c.Endpoint, "dns:///") + case strings.HasPrefix(c.Endpoint, "dns://"): + r := regexp.MustCompile("^dns://[/]?") + return r.ReplaceAllString(c.Endpoint, "") default: return c.Endpoint } diff --git a/exporter/otlpexporter/config_test.go b/exporter/otlpexporter/config_test.go index 2167f803ef3..a29d0182860 100644 --- a/exporter/otlpexporter/config_test.go +++ b/exporter/otlpexporter/config_test.go @@ -134,6 +134,17 @@ func TestUnmarshalInvalidConfig(t *testing.T) { func TestValidDNSEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.Endpoint = "dns:///backend.example.com:4317" + cfg.Endpoint = "dns://authority/backend.example.com:4317" assert.NoError(t, cfg.Validate()) } + +func TestSanitizeEndpoint(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig().(*Config) + cfg.Endpoint = "dns://authority/backend.example.com:4317" + assert.Equal(t, "authority/backend.example.com:4317", cfg.sanitizedEndpoint()) + cfg.Endpoint = "dns:///backend.example.com:4317" + assert.Equal(t, "backend.example.com:4317", cfg.sanitizedEndpoint()) + cfg.Endpoint = "dns:////backend.example.com:4317" + assert.Equal(t, "/backend.example.com:4317", cfg.sanitizedEndpoint()) +} From a082f2e439e8f77a9a9503d54d8afea576f2d08c Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 1 Jul 2024 22:07:11 +0200 Subject: [PATCH 116/168] [chore] Prepare release v1.11.0/v0.104.0 (#10491) The following commands were run to prepare this release: - make chlog-update VERSION=v1.11.0/v0.104.0 - make prepare-release PREVIOUS_VERSION=1.10.0 RELEASE_CANDIDATE=1.11.0 MODSET=stable - make prepare-release PREVIOUS_VERSION=0.103.0 RELEASE_CANDIDATE=0.104.0 MODSET=beta --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --- .../codeboten_remove-additional-slash.yaml | 25 ------ .chloggen/combinedfilter_remove.yaml | 25 ------ ...fmap-unifyEnvVarExpansion-gate-beta-2.yaml | 25 ------ ...onfmap-unifyEnvVarExpansion-gate-beta.yaml | 25 ------ .chloggen/cookie_support.yaml | 25 ------ .../debug-exporter-normal-verbosity.yaml | 25 ------ .../debug-exporter-use-internal-logger.yaml | 25 ------ .chloggen/fix_ipv6_too_many_colon.yaml | 20 ----- .chloggen/move-otelcoltest-2.yaml | 25 ------ .chloggen/move-otelcoltest.yaml | 25 ------ .chloggen/move_configretry_stable.yaml | 25 ------ ...mx-psi_enable-component-localhost-fgh.yaml | 26 ------ .chloggen/otelcol-update-commane-2.yaml | 25 ------ .chloggen/otelcol-update-commane.yaml | 25 ------ .chloggen/pprofile-wrapper.yaml | 25 ------ .chloggen/print-tracestate.yaml | 25 ------ .chloggen/processorhelper-inserted-api.yaml | 25 ------ .chloggen/processorhelper-inserted.yaml | 29 ------ .chloggen/profile-testdata.yaml | 25 ------ CHANGELOG-API.md | 21 +++++ CHANGELOG.md | 36 ++++++++ cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 44 +++++----- cmd/builder/test/core.builder.yaml | 10 ++- cmd/mdatagen/go.mod | 20 ++--- cmd/otelcorecol/builder-config.yaml | 40 ++++----- cmd/otelcorecol/go.mod | 88 +++++++++---------- cmd/otelcorecol/main.go | 2 +- component/go.mod | 4 +- config/configauth/go.mod | 14 +-- config/configgrpc/go.mod | 32 +++---- config/confighttp/go.mod | 26 +++--- config/configtls/go.mod | 2 +- config/internal/go.mod | 4 +- confmap/converter/expandconverter/go.mod | 6 +- confmap/go.mod | 2 +- confmap/internal/e2e/go.mod | 4 +- confmap/provider/envprovider/go.mod | 4 +- confmap/provider/fileprovider/go.mod | 4 +- confmap/provider/httpprovider/go.mod | 4 +- confmap/provider/httpsprovider/go.mod | 4 +- confmap/provider/yamlprovider/go.mod | 4 +- connector/forwardconnector/go.mod | 16 ++-- connector/go.mod | 14 +-- consumer/go.mod | 6 +- exporter/debugexporter/go.mod | 26 +++--- exporter/go.mod | 24 ++--- exporter/loggingexporter/go.mod | 22 ++--- exporter/nopexporter/go.mod | 16 ++-- exporter/otlpexporter/go.mod | 42 ++++----- exporter/otlphttpexporter/go.mod | 36 ++++---- extension/auth/go.mod | 12 +-- extension/ballastextension/go.mod | 14 +-- extension/go.mod | 10 +-- extension/memorylimiterextension/go.mod | 14 +-- extension/zpagesextension/go.mod | 28 +++--- filter/go.mod | 4 +- go.mod | 16 ++-- internal/e2e/go.mod | 44 +++++----- otelcol/go.mod | 32 +++---- otelcol/otelcoltest/go.mod | 44 +++++----- pdata/pprofile/go.mod | 2 +- pdata/testdata/go.mod | 4 +- processor/batchprocessor/go.mod | 20 ++--- processor/go.mod | 14 +-- processor/memorylimiterprocessor/go.mod | 20 ++--- receiver/go.mod | 10 +-- receiver/nopreceiver/go.mod | 14 +-- receiver/otlpreceiver/go.mod | 40 ++++----- service/go.mod | 46 +++++----- versions.yaml | 4 +- 71 files changed, 515 insertions(+), 931 deletions(-) delete mode 100644 .chloggen/codeboten_remove-additional-slash.yaml delete mode 100644 .chloggen/combinedfilter_remove.yaml delete mode 100644 .chloggen/confmap-unifyEnvVarExpansion-gate-beta-2.yaml delete mode 100644 .chloggen/confmap-unifyEnvVarExpansion-gate-beta.yaml delete mode 100644 .chloggen/cookie_support.yaml delete mode 100644 .chloggen/debug-exporter-normal-verbosity.yaml delete mode 100644 .chloggen/debug-exporter-use-internal-logger.yaml delete mode 100644 .chloggen/fix_ipv6_too_many_colon.yaml delete mode 100644 .chloggen/move-otelcoltest-2.yaml delete mode 100644 .chloggen/move-otelcoltest.yaml delete mode 100644 .chloggen/move_configretry_stable.yaml delete mode 100644 .chloggen/mx-psi_enable-component-localhost-fgh.yaml delete mode 100644 .chloggen/otelcol-update-commane-2.yaml delete mode 100644 .chloggen/otelcol-update-commane.yaml delete mode 100644 .chloggen/pprofile-wrapper.yaml delete mode 100644 .chloggen/print-tracestate.yaml delete mode 100644 .chloggen/processorhelper-inserted-api.yaml delete mode 100644 .chloggen/processorhelper-inserted.yaml delete mode 100644 .chloggen/profile-testdata.yaml diff --git a/.chloggen/codeboten_remove-additional-slash.yaml b/.chloggen/codeboten_remove-additional-slash.yaml deleted file mode 100644 index 72fbe623fdb..00000000000 --- a/.chloggen/codeboten_remove-additional-slash.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otlpexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Update validation to support both dns:// and dns:/// - -# One or more tracking issues or pull requests related to the change -issues: [10449] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [user] diff --git a/.chloggen/combinedfilter_remove.yaml b/.chloggen/combinedfilter_remove.yaml deleted file mode 100644 index 132bd127a79..00000000000 --- a/.chloggen/combinedfilter_remove.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: filter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated `filter.CombinedFilter` - -# One or more tracking issues or pull requests related to the change -issues: [10348] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/confmap-unifyEnvVarExpansion-gate-beta-2.yaml b/.chloggen/confmap-unifyEnvVarExpansion-gate-beta-2.yaml deleted file mode 100644 index 82eaabe4c5d..00000000000 --- a/.chloggen/confmap-unifyEnvVarExpansion-gate-beta-2.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcol - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: By default, `otelcol.NewCommand` and `otelcol.NewCommandMustSetProvider` will set the `DefaultScheme` to `env`. - -# One or more tracking issues or pull requests related to the change -issues: [10435] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/confmap-unifyEnvVarExpansion-gate-beta.yaml b/.chloggen/confmap-unifyEnvVarExpansion-gate-beta.yaml deleted file mode 100644 index b5320642cc5..00000000000 --- a/.chloggen/confmap-unifyEnvVarExpansion-gate-beta.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: expandconverter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: By default expandconverter will now error if it is about to expand `$FOO` syntax. Update configuration to use `${env:FOO}` instead or disable the feature gate. - -# One or more tracking issues or pull requests related to the change -issues: [10435] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/cookie_support.yaml b/.chloggen/cookie_support.yaml deleted file mode 100644 index d360efa6177..00000000000 --- a/.chloggen/cookie_support.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add support for cookies in HTTP clients with `cookies::enabled`. - -# One or more tracking issues or pull requests related to the change -issues: [10175] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: The method `confighttp.ToClient` will return a client with a `cookiejar.Jar` which will reuse cookies from server responses in subsequent requests. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/debug-exporter-normal-verbosity.yaml b/.chloggen/debug-exporter-normal-verbosity.yaml deleted file mode 100644 index 8fe3264a232..00000000000 --- a/.chloggen/debug-exporter-normal-verbosity.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporter/debug - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: In `normal` verbosity, display one line of text for each telemetry record (log, data point, span) - -# One or more tracking issues or pull requests related to the change -issues: [7806] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/debug-exporter-use-internal-logger.yaml b/.chloggen/debug-exporter-use-internal-logger.yaml deleted file mode 100644 index df4346e21bb..00000000000 --- a/.chloggen/debug-exporter-use-internal-logger.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporter/debug - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add option `use_internal_logger` - -# One or more tracking issues or pull requests related to the change -issues: [10226] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/fix_ipv6_too_many_colon.yaml b/.chloggen/fix_ipv6_too_many_colon.yaml deleted file mode 100644 index d62a72dc220..00000000000 --- a/.chloggen/fix_ipv6_too_many_colon.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fixed a bug that caused otel-collector to fail to start with ipv6 metrics endpoint service telemetry. - -# One or more tracking issues or pull requests related to the change -issues: [10011] - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [user] diff --git a/.chloggen/move-otelcoltest-2.yaml b/.chloggen/move-otelcoltest-2.yaml deleted file mode 100644 index afcd0737569..00000000000 --- a/.chloggen/move-otelcoltest-2.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: new_component - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcoltest - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Split off go.opentelemetry.io/collector/otelcol/otelcoltest into its own module - -# One or more tracking issues or pull requests related to the change -issues: [10417] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/move-otelcoltest.yaml b/.chloggen/move-otelcoltest.yaml deleted file mode 100644 index 996bb6c61c5..00000000000 --- a/.chloggen/move-otelcoltest.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcoltest - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecates `LoadConfigWithSettings` and `LoadConfigAndValidateWithSettings`. Use `LoadConfig` and `LoadConfigAndValidate` instead. - -# One or more tracking issues or pull requests related to the change -issues: [10417] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/move_configretry_stable.yaml b/.chloggen/move_configretry_stable.yaml deleted file mode 100644 index a237decc028..00000000000 --- a/.chloggen/move_configretry_stable.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: configretry - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Mark module as stable. - -# One or more tracking issues or pull requests related to the change -issues: [10279] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/mx-psi_enable-component-localhost-fgh.yaml b/.chloggen/mx-psi_enable-component-localhost-fgh.yaml deleted file mode 100644 index 2364449bc8e..00000000000 --- a/.chloggen/mx-psi_enable-component-localhost-fgh.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otlpreceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Switch to `localhost` as the default for all endpoints. - -# One or more tracking issues or pull requests related to the change -issues: [8510] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - Disable the `component.UseLocalHostAsDefaultHost` feature gate to temporarily get the previous default. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/otelcol-update-commane-2.yaml b/.chloggen/otelcol-update-commane-2.yaml deleted file mode 100644 index 4c799647a18..00000000000 --- a/.chloggen/otelcol-update-commane-2.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcol - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: The `otelcol.NewCommandMustSetProvider` is deprecated. Use `otelcol.NewCommand` instead. - -# One or more tracking issues or pull requests related to the change -issues: [10436] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/otelcol-update-commane.yaml b/.chloggen/otelcol-update-commane.yaml deleted file mode 100644 index 8a5ba5b9724..00000000000 --- a/.chloggen/otelcol-update-commane.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcol - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: The `otelcol.NewCommand` now requires at least one provider be set. - -# One or more tracking issues or pull requests related to the change -issues: [10436] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/pprofile-wrapper.yaml b/.chloggen/pprofile-wrapper.yaml deleted file mode 100644 index bd69f1e9925..00000000000 --- a/.chloggen/pprofile-wrapper.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: pdata/pprofile - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add pprofile wrapper to convert proto into pprofile. - -# One or more tracking issues or pull requests related to the change -issues: [10401] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/print-tracestate.yaml b/.chloggen/print-tracestate.yaml deleted file mode 100644 index ccb9f650984..00000000000 --- a/.chloggen/print-tracestate.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: debugexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Print Span.TraceState() when present. - -# One or more tracking issues or pull requests related to the change -issues: [10421] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: Enables viewing sampling threshold information (as by OTEP 235 samplers). - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [user] diff --git a/.chloggen/processorhelper-inserted-api.yaml b/.chloggen/processorhelper-inserted-api.yaml deleted file mode 100644 index 4ce25669388..00000000000 --- a/.chloggen/processorhelper-inserted-api.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component/componenttest - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Added additional "inserted" count to `TestTelemetry.CheckProcessor*` methods. - -# One or more tracking issues or pull requests related to the change -issues: [10353] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/processorhelper-inserted.yaml b/.chloggen/processorhelper-inserted.yaml deleted file mode 100644 index 7ed6de7e864..00000000000 --- a/.chloggen/processorhelper-inserted.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: 'enhancement' - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: processorhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add "inserted" metrics for processors. - -# One or more tracking issues or pull requests related to the change -issues: [10353] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - This includes the following metrics for processors: - - `processor_inserted_spans` - - `processor_inserted_metric_points` - - `processor_inserted_log_records` - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] diff --git a/.chloggen/profile-testdata.yaml b/.chloggen/profile-testdata.yaml deleted file mode 100644 index fb2be1ee340..00000000000 --- a/.chloggen/profile-testdata.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: pdata/testdata - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add pdata testdata for profiles. - -# One or more tracking issues or pull requests related to the change -issues: [10401] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/CHANGELOG-API.md b/CHANGELOG-API.md index 2d5ddd588c6..26739418ab8 100644 --- a/CHANGELOG-API.md +++ b/CHANGELOG-API.md @@ -7,6 +7,27 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG +## v1.11.0/v0.104.0 + +### 🛑 Breaking changes 🛑 + +- `otelcol`: The `otelcol.NewCommand` now requires at least one provider be set. (#10436) +- `component/componenttest`: Added additional "inserted" count to `TestTelemetry.CheckProcessor*` methods. (#10353) + +### 🚩 Deprecations 🚩 + +- `otelcoltest`: Deprecates `LoadConfigWithSettings` and `LoadConfigAndValidateWithSettings`. Use `LoadConfig` and `LoadConfigAndValidate` instead. (#10417) +- `otelcol`: The `otelcol.NewCommandMustSetProvider` is deprecated. Use `otelcol.NewCommand` instead. (#10436) + +### 🚀 New components 🚀 + +- `otelcoltest`: Split off go.opentelemetry.io/collector/otelcol/otelcoltest into its own module (#10417) + +### 💡 Enhancements 💡 + +- `pdata/pprofile`: Add pprofile wrapper to convert proto into pprofile. (#10401) +- `pdata/testdata`: Add pdata testdata for profiles. (#10401) + ## v1.10.0/v0.103.0 ### 🛑 Breaking changes 🛑 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2779ed45a48..88623529a5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,42 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./ +## v1.11.0/v0.104.0 + +This release includes 2 very important breaking changes. +1. The `otlpreceiver` will now use `localhost` by default instead of `0.0.0.0`. This may break the receiver in containerized environments like Kubernetes. If you depend on `0.0.0.0` disable the `component.UseLocalHostAsDefaultHost` feature gate or explicitly set the endpoint to `0.0.0.0`. +2. Expansion of BASH-style environment variables, such as `$FOO` will no longer be supported by default. If you depend on this syntax, disable the `confmap.unifyEnvVarExpansion` feature gate, but know that the feature will be removed in the future in favor of `${env:FOO}`. + +### 🛑 Breaking changes 🛑 + +- `filter`: Remove deprecated `filter.CombinedFilter` (#10348) +- `otelcol`: By default, `otelcol.NewCommand` and `otelcol.NewCommandMustSetProvider` will set the `DefaultScheme` to `env`. (#10435) +- `expandconverter`: By default expandconverter will now error if it is about to expand `$FOO` syntax. Update configuration to use `${env:FOO}` instead or disable the `confmap.unifyEnvVarExpansion` feature gate. (#10435) +- `otlpreceiver`: Switch to `localhost` as the default for all endpoints. (#8510) + Disable the `component.UseLocalHostAsDefaultHost` feature gate to temporarily get the previous default. + + +### 💡 Enhancements 💡 + +- `confighttp`: Add support for cookies in HTTP clients with `cookies::enabled`. (#10175) + The method `confighttp.ToClient` will return a client with a `cookiejar.Jar` which will reuse cookies from server responses in subsequent requests. +- `exporter/debug`: In `normal` verbosity, display one line of text for each telemetry record (log, data point, span) (#7806) +- `exporter/debug`: Add option `use_internal_logger` (#10226) +- `configretry`: Mark module as stable. (#10279) +- `debugexporter`: Print Span.TraceState() when present. (#10421) + Enables viewing sampling threshold information (as by OTEP 235 samplers). +- `processorhelper`: Add "inserted" metrics for processors. (#10353) + This includes the following metrics for processors: + - `processor_inserted_spans` + - `processor_inserted_metric_points` + - `processor_inserted_log_records` + + +### 🧰 Bug fixes 🧰 + +- `otlpexporter`: Update validation to support both dns:// and dns:/// (#10449) +- `service`: Fixed a bug that caused otel-collector to fail to start with ipv6 metrics endpoint service telemetry. (#10011) + ## v1.10.0/v0.103.0 ### 🛑 Breaking changes 🛑 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 33cb0ab008a..8ce3316ea72 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -17,7 +17,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.103.0" +const defaultOtelColVersion = "0.104.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 6e9f8257205..76add096451 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -1,8 +1,8 @@ # NOTE: # This builder configuration is NOT used to build any official binary. -# To see the builder manifests used for official binaries, +# To see the builder manifests used for official binaries, # check https://github.com/open-telemetry/opentelemetry-collector-releases -# +# # For the OpenTelemetry Collector Core official distribution sources, check # https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol @@ -10,32 +10,32 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.103.0-dev - otelcol_version: 0.103.0 + version: 0.104.0-dev + otelcol_version: 0.104.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.103.0 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.104.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.103.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.103.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.103.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.104.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.104.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.104.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.104.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.103.0 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.103.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.103.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.104.0 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.104.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.104.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.103.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.104.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.104.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.103.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.104.0 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.0 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 4b39421df81..260429422c1 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.103.0 + otelcol_version: 0.104.0 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.103.0 + gomod: go.opentelemetry.io/collector v0.104.0 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.103.0 + gomod: go.opentelemetry.io/collector v0.104.0 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/debugexporter - gomod: go.opentelemetry.io/collector v0.103.0 + gomod: go.opentelemetry.io/collector v0.104.0 path: ${WORKSPACE_DIR} replaces: @@ -47,7 +47,9 @@ replaces: - go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension - go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate - go.opentelemetry.io/collector/otelcol => ${WORKSPACE_DIR}/otelcol + - go.opentelemetry.io/collector/otelcol/otelcoltest => ${WORKSPACE_DIR}/otelcol/otelcoltest - go.opentelemetry.io/collector/pdata => ${WORKSPACE_DIR}/pdata + - go.opentelemetry.io/collector/pdata/pprofile => ${WORKSPACE_DIR}/pdata/pprofile - go.opentelemetry.io/collector/pdata/testdata => ${WORKSPACE_DIR}/pdata/testdata - go.opentelemetry.io/collector/processor => ${WORKSPACE_DIR}/processor - go.opentelemetry.io/collector/receiver => ${WORKSPACE_DIR}/receiver diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index e96e33fbcc4..48374a949d3 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -5,15 +5,15 @@ go 1.21.0 require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/filter v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/receiver v0.103.0 - go.opentelemetry.io/collector/semconv v0.103.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/filter v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/receiver v0.104.0 + go.opentelemetry.io/collector/semconv v0.104.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 @@ -46,7 +46,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 5630bd9ac80..be9be01815d 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -10,34 +10,34 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.103.0-dev - otelcol_version: 0.103.0 + version: 0.104.0-dev + otelcol_version: 0.104.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.103.0 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.104.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.103.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.103.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.103.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.104.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.104.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.104.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.104.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.103.0 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.103.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.103.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.104.0 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.104.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.104.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.103.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.104.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.104.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.103.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.104.0 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 40274203ee1..7b53dfa788f 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -7,33 +7,33 @@ go 1.21.0 toolchain go1.21.11 require ( - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.103.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 - go.opentelemetry.io/collector/connector v0.103.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/exporter/debugexporter v0.103.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.103.0 - go.opentelemetry.io/collector/exporter/nopexporter v0.103.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 - go.opentelemetry.io/collector/extension/ballastextension v0.103.0 - go.opentelemetry.io/collector/extension/memorylimiterextension v0.103.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.103.0 - go.opentelemetry.io/collector/otelcol v0.103.0 - go.opentelemetry.io/collector/processor v0.103.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.103.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.0 - go.opentelemetry.io/collector/receiver v0.103.0 - go.opentelemetry.io/collector/receiver/nopreceiver v0.103.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.0 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.0 + go.opentelemetry.io/collector/connector v0.104.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.104.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.104.0 + go.opentelemetry.io/collector/exporter/nopexporter v0.104.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.104.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 + go.opentelemetry.io/collector/extension/ballastextension v0.104.0 + go.opentelemetry.io/collector/extension/memorylimiterextension v0.104.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.104.0 + go.opentelemetry.io/collector/otelcol v0.104.0 + go.opentelemetry.io/collector/processor v0.104.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.104.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.104.0 + go.opentelemetry.io/collector/receiver v0.104.0 + go.opentelemetry.io/collector/receiver/nopreceiver v0.104.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.0 golang.org/x/sys v0.21.0 ) @@ -79,23 +79,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.103.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.103.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.103.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.103.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.103.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.103.0 // indirect - go.opentelemetry.io/collector/config/internal v0.103.0 // indirect - go.opentelemetry.io/collector/consumer v0.103.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect - go.opentelemetry.io/collector/semconv v0.103.0 // indirect - go.opentelemetry.io/collector/service v0.103.0 // indirect + go.opentelemetry.io/collector v0.104.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.104.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.104.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.104.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.11.0 // indirect + go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.104.0 // indirect + go.opentelemetry.io/collector/config/internal v0.104.0 // indirect + go.opentelemetry.io/collector/consumer v0.104.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect + go.opentelemetry.io/collector/semconv v0.104.0 // indirect + go.opentelemetry.io/collector/service v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 358cb8644cd..45b25c6bb27 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -21,7 +21,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.103.0-dev", + Version: "0.104.0-dev", } set := otelcol.CollectorSettings{ diff --git a/component/go.mod b/component/go.mod index d5610bae4d8..530d95f560a 100644 --- a/component/go.mod +++ b/component/go.mod @@ -7,8 +7,8 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.54.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/exporters/prometheus v0.49.0 go.opentelemetry.io/otel/metric v1.27.0 diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 19a6793fc08..17baace3c83 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -4,9 +4,9 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 - go.opentelemetry.io/collector/extension/auth v0.103.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 + go.opentelemetry.io/collector/extension/auth v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -21,10 +21,10 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/confmap v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/confmap v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 0dbc138a4c0..8be437cc87f 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -5,19 +5,19 @@ go 1.21.0 require ( github.com/mostynb/go-grpc-compression v1.2.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configauth v0.103.0 - go.opentelemetry.io/collector/config/configcompression v1.10.0 - go.opentelemetry.io/collector/config/confignet v0.103.0 - go.opentelemetry.io/collector/config/configopaque v1.10.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/config/configtls v0.103.0 - go.opentelemetry.io/collector/config/internal v0.103.0 - go.opentelemetry.io/collector/extension/auth v0.103.0 - go.opentelemetry.io/collector/featuregate v1.10.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configauth v0.104.0 + go.opentelemetry.io/collector/config/configcompression v1.11.0 + go.opentelemetry.io/collector/config/confignet v0.104.0 + go.opentelemetry.io/collector/config/configopaque v1.11.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/config/configtls v0.104.0 + go.opentelemetry.io/collector/config/internal v0.104.0 + go.opentelemetry.io/collector/extension/auth v0.104.0 + go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 @@ -50,9 +50,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.103.0 // indirect - go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/confmap v0.104.0 // indirect + go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 21ba6d3036f..1b097679fe6 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -7,16 +7,16 @@ require ( github.com/klauspost/compress v1.17.9 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configauth v0.103.0 - go.opentelemetry.io/collector/config/configcompression v1.10.0 - go.opentelemetry.io/collector/config/configopaque v1.10.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/config/configtls v0.103.0 - go.opentelemetry.io/collector/config/internal v0.103.0 - go.opentelemetry.io/collector/extension/auth v0.103.0 - go.opentelemetry.io/collector/featuregate v1.10.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configauth v0.104.0 + go.opentelemetry.io/collector/config/configcompression v1.11.0 + go.opentelemetry.io/collector/config/configopaque v1.11.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/config/configtls v0.104.0 + go.opentelemetry.io/collector/config/internal v0.104.0 + go.opentelemetry.io/collector/extension/auth v0.104.0 + go.opentelemetry.io/collector/featuregate v1.11.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 @@ -45,9 +45,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.103.0 // indirect - go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/confmap v0.104.0 // indirect + go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect diff --git a/config/configtls/go.mod b/config/configtls/go.mod index e2bb8dd3e1c..d97534fa1c9 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -5,7 +5,7 @@ go 1.21.0 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configopaque v1.10.0 + go.opentelemetry.io/collector/config/configopaque v1.11.0 ) require ( diff --git a/config/internal/go.mod b/config/internal/go.mod index 7935ffc8420..dcc3ba5ac7c 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 + go.opentelemetry.io/collector v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -13,7 +13,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index e2c0bd1125f..f0d150834bb 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -4,9 +4,9 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/featuregate v1.10.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/featuregate v1.11.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/go.mod b/confmap/go.mod index 2a0d358c298..128fbdb14f1 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -8,7 +8,7 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 github.com/knadh/koanf/v2 v2.1.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/featuregate v1.10.0 + go.opentelemetry.io/collector/featuregate v1.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/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod index 7bffda7c1a7..7ba34d6de14 100644 --- a/confmap/internal/e2e/go.mod +++ b/confmap/internal/e2e/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap v0.104.0 go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 - go.opentelemetry.io/collector/featuregate v1.10.0 + go.opentelemetry.io/collector/featuregate v1.11.0 ) require ( diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index d4d9b067f60..cd17275e2b1 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -19,7 +19,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index c51548f04dc..3c24a90ceb5 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -18,7 +18,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index 6491d8affac..ab8c89e2735 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -18,7 +18,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index 7264cbe3b02..b66db34aaf0 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -18,7 +18,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index eb31c60e56e..f3c856c1061 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -18,7 +18,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index ee5c2b80467..844c91e0b96 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,11 +4,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/connector v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/connector v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 go.uber.org/goleak v1.3.0 ) @@ -35,9 +35,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.103.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector v0.104.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/connector/go.mod b/connector/go.mod index 4bb65875437..5b224c79847 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -30,8 +30,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index 5afc53a9c3d..b18e42b8c6d 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -4,8 +4,8 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -16,7 +16,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.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.23.0 // indirect golang.org/x/sys v0.18.0 // indirect diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index dc28381d31e..9b88b69b62d 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -4,13 +4,13 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -39,12 +39,12 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.103.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.103.0 // indirect - go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect - go.opentelemetry.io/collector/receiver v0.103.0 // indirect + go.opentelemetry.io/collector v0.104.0 // indirect + go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect + go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect + go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/go.mod b/exporter/go.mod index c84500495f6..0c9da3fde58 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,15 +6,15 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configretry v0.103.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 - go.opentelemetry.io/collector/receiver v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configretry v1.11.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 + go.opentelemetry.io/collector/receiver v0.104.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 @@ -49,9 +49,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/confmap v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/confmap v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/text v0.15.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index c03f7bca6e7..617732fe4a0 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -38,12 +38,12 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector v0.103.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.103.0 // indirect - go.opentelemetry.io/collector/consumer v0.103.0 // indirect - go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/receiver v0.103.0 // indirect + go.opentelemetry.io/collector v0.104.0 // indirect + go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect + go.opentelemetry.io/collector/consumer v0.104.0 // indirect + go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index dfee2fb64d2..35723a899b9 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -4,11 +4,11 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 go.uber.org/goleak v1.3.0 ) @@ -35,9 +35,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/receiver v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 0582666f260..11466d19f0d 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,19 +4,19 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configauth v0.103.0 - go.opentelemetry.io/collector/config/configcompression v1.10.0 - go.opentelemetry.io/collector/config/configgrpc v0.103.0 - go.opentelemetry.io/collector/config/configopaque v1.10.0 - go.opentelemetry.io/collector/config/configretry v0.103.0 - go.opentelemetry.io/collector/config/configtls v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configauth v0.104.0 + go.opentelemetry.io/collector/config/configcompression v1.11.0 + go.opentelemetry.io/collector/config/configgrpc v0.104.0 + go.opentelemetry.io/collector/config/configopaque v1.11.0 + go.opentelemetry.io/collector/config/configretry v1.11.0 + go.opentelemetry.io/collector/config/configtls v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -53,14 +53,14 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.103.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/config/internal v0.103.0 // indirect - go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect - go.opentelemetry.io/collector/receiver v0.103.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.104.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/config/internal v0.104.0 // indirect + go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect + go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 61c34d04c25..3a2922ba1e9 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,17 +4,17 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configcompression v1.10.0 - go.opentelemetry.io/collector/config/confighttp v0.103.0 - go.opentelemetry.io/collector/config/configopaque v1.10.0 - go.opentelemetry.io/collector/config/configretry v0.103.0 - go.opentelemetry.io/collector/config/configtls v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configcompression v1.11.0 + go.opentelemetry.io/collector/config/confighttp v0.104.0 + go.opentelemetry.io/collector/config/configopaque v1.11.0 + go.opentelemetry.io/collector/config/configretry v1.11.0 + go.opentelemetry.io/collector/config/configtls v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -52,13 +52,13 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/config/internal v0.103.0 // indirect - go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/receiver v0.103.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/config/internal v0.104.0 // indirect + go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/extension/auth/go.mod b/extension/auth/go.mod index fd224c13122..2fccb15c665 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -4,8 +4,8 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 go.uber.org/goleak v1.3.0 google.golang.org/grpc v1.64.0 ) @@ -29,10 +29,10 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/confmap v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/confmap v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 40eec48ca11..ca564eb83d6 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -5,10 +5,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -40,9 +40,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/go.mod b/extension/go.mod index 06311507ab3..9491e766a5b 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -5,8 +5,8 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -29,9 +29,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 85017f19736..089492904a9 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -39,9 +39,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 94fbb642050..4f2cdc8b393 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,12 +4,12 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configauth v0.103.0 - go.opentelemetry.io/collector/config/confighttp v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configauth v0.104.0 + go.opentelemetry.io/collector/config/confighttp v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 go.opentelemetry.io/contrib/zpages v0.52.0 go.opentelemetry.io/otel/sdk v1.27.0 go.opentelemetry.io/otel/trace v1.27.0 @@ -44,14 +44,14 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.103.0 // indirect - go.opentelemetry.io/collector/config/internal v0.103.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.11.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.104.0 // indirect + go.opentelemetry.io/collector/config/internal v0.104.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/filter/go.mod b/filter/go.mod index f69262e2587..f7ae2122b35 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.103.0 + go.opentelemetry.io/collector/confmap v0.104.0 ) require ( @@ -17,7 +17,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.mod b/go.mod index 9531c1b08f0..243f0466005 100644 --- a/go.mod +++ b/go.mod @@ -13,12 +13,12 @@ go 1.21.0 require ( github.com/shirou/gopsutil/v4 v4.24.5 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/featuregate v1.10.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.opentelemetry.io/contrib/config v0.7.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 @@ -56,8 +56,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 62b7951791e..2461d29d6ae 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -4,21 +4,21 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configgrpc v0.103.0 - go.opentelemetry.io/collector/config/confighttp v0.103.0 - go.opentelemetry.io/collector/config/configopaque v1.10.0 - go.opentelemetry.io/collector/config/configretry v0.103.0 - go.opentelemetry.io/collector/config/configtls v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configgrpc v0.104.0 + go.opentelemetry.io/collector/config/confighttp v0.104.0 + go.opentelemetry.io/collector/config/configopaque v1.11.0 + go.opentelemetry.io/collector/config/configretry v1.11.0 + go.opentelemetry.io/collector/config/configtls v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 - go.opentelemetry.io/collector/receiver v0.103.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 + go.opentelemetry.io/collector/receiver v0.104.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0 go.uber.org/goleak v1.3.0 ) @@ -54,15 +54,15 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.103.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/config/internal v0.103.0 // indirect - go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.104.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/config/internal v0.104.0 // indirect + go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index 3da6c7e9088..fc1e7ff860c 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,17 +5,17 @@ go 1.21.0 require ( github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/connector v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 - go.opentelemetry.io/collector/featuregate v1.10.0 - go.opentelemetry.io/collector/processor v0.103.0 - go.opentelemetry.io/collector/receiver v0.103.0 - go.opentelemetry.io/collector/service v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/connector v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 + go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/processor v0.104.0 + go.opentelemetry.io/collector/receiver v0.104.0 + go.opentelemetry.io/collector/service v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -62,11 +62,11 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.103.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.103.0 // indirect - go.opentelemetry.io/collector/semconv v0.103.0 // indirect + go.opentelemetry.io/collector/consumer v0.104.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect + go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 60cb5d4d703..89b1af05c27 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -4,20 +4,20 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.103.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0 - go.opentelemetry.io/collector/connector v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 - go.opentelemetry.io/collector/otelcol v0.103.0 - go.opentelemetry.io/collector/processor v0.103.0 - go.opentelemetry.io/collector/receiver v0.103.0 - go.opentelemetry.io/collector/service v0.103.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.0 + go.opentelemetry.io/collector/connector v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 + go.opentelemetry.io/collector/otelcol v0.104.0 + go.opentelemetry.io/collector/processor v0.104.0 + go.opentelemetry.io/collector/receiver v0.104.0 + go.opentelemetry.io/collector/service v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -59,14 +59,14 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.103.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/consumer v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.103.0 // indirect - go.opentelemetry.io/collector/semconv v0.103.0 // indirect + go.opentelemetry.io/collector v0.104.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/consumer v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect + go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod index fe049a6daff..60b24e88038 100644 --- a/pdata/pprofile/go.mod +++ b/pdata/pprofile/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.11 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector/pdata v1.11.0 ) require ( diff --git a/pdata/testdata/go.mod b/pdata/testdata/go.mod index dd15ae52815..8e064fada79 100644 --- a/pdata/testdata/go.mod +++ b/pdata/testdata/go.mod @@ -3,8 +3,8 @@ module go.opentelemetry.io/collector/pdata/testdata go 1.21.0 require ( - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 ) require ( diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 82ae287c710..c34deff309f 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -4,14 +4,14 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 - go.opentelemetry.io/collector/processor v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 + go.opentelemetry.io/collector/processor v0.104.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/go.mod b/processor/go.mod index d202175e947..d8ed158ae15 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -5,12 +5,12 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk/metric v1.27.0 @@ -34,7 +34,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 742ec39145c..f876f4ee8c8 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,12 +4,12 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/processor v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/processor v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -43,10 +43,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.103.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/receiver/go.mod b/receiver/go.mod index 4df1edb183a..a14e04eb80c 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index f883f64c2f6..e3eae609021 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -4,10 +4,10 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/receiver v0.103.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/receiver v0.104.0 go.uber.org/goleak v1.3.0 ) @@ -34,9 +34,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata v1.10.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/metric v1.27.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 3b24dc33d7c..1a0a1aeb8f6 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -6,17 +6,17 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/klauspost/compress v1.17.9 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/configgrpc v0.103.0 - go.opentelemetry.io/collector/config/confighttp v0.103.0 - go.opentelemetry.io/collector/config/confignet v0.103.0 - go.opentelemetry.io/collector/config/configtls v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 - go.opentelemetry.io/collector/receiver v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/configgrpc v0.104.0 + go.opentelemetry.io/collector/config/confighttp v0.104.0 + go.opentelemetry.io/collector/config/confignet v0.104.0 + go.opentelemetry.io/collector/config/configtls v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 + go.opentelemetry.io/collector/receiver v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 @@ -53,15 +53,15 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect - go.opentelemetry.io/collector/config/internal v0.103.0 // indirect - go.opentelemetry.io/collector/extension v0.103.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect - go.opentelemetry.io/collector/featuregate v1.10.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.11.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/config/internal v0.104.0 // indirect + go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/service/go.mod b/service/go.mod index 24d125be540..e973b65efde 100644 --- a/service/go.mod +++ b/service/go.mod @@ -10,22 +10,22 @@ require ( github.com/shirou/gopsutil/v4 v4.24.5 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.103.0 - go.opentelemetry.io/collector/component v0.103.0 - go.opentelemetry.io/collector/config/confighttp v0.103.0 - go.opentelemetry.io/collector/config/configtelemetry v0.103.0 - go.opentelemetry.io/collector/confmap v0.103.0 - go.opentelemetry.io/collector/connector v0.103.0 - go.opentelemetry.io/collector/consumer v0.103.0 - go.opentelemetry.io/collector/exporter v0.103.0 - go.opentelemetry.io/collector/extension v0.103.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.103.0 - go.opentelemetry.io/collector/featuregate v1.10.0 - go.opentelemetry.io/collector/pdata v1.10.0 - go.opentelemetry.io/collector/pdata/testdata v0.103.0 - go.opentelemetry.io/collector/processor v0.103.0 - go.opentelemetry.io/collector/receiver v0.103.0 - go.opentelemetry.io/collector/semconv v0.103.0 + go.opentelemetry.io/collector v0.104.0 + go.opentelemetry.io/collector/component v0.104.0 + go.opentelemetry.io/collector/config/confighttp v0.104.0 + go.opentelemetry.io/collector/config/configtelemetry v0.104.0 + go.opentelemetry.io/collector/confmap v0.104.0 + go.opentelemetry.io/collector/connector v0.104.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/exporter v0.104.0 + go.opentelemetry.io/collector/extension v0.104.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.104.0 + go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/pdata v1.11.0 + go.opentelemetry.io/collector/pdata/testdata v0.104.0 + go.opentelemetry.io/collector/processor v0.104.0 + go.opentelemetry.io/collector/receiver v0.104.0 + go.opentelemetry.io/collector/semconv v0.104.0 go.opentelemetry.io/contrib/config v0.7.0 go.opentelemetry.io/contrib/propagators/b3 v1.27.0 go.opentelemetry.io/otel v1.27.0 @@ -78,13 +78,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.4 // indirect - go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.103.0 // indirect - go.opentelemetry.io/collector/config/internal v0.103.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.11.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.104.0 // indirect + go.opentelemetry.io/collector/config/internal v0.104.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect diff --git a/versions.yaml b/versions.yaml index 0b4ee0826ff..f61dbc00e9d 100644 --- a/versions.yaml +++ b/versions.yaml @@ -3,7 +3,7 @@ module-sets: stable: - version: v1.10.0 + version: v1.11.0 modules: - go.opentelemetry.io/collector/featuregate - go.opentelemetry.io/collector/pdata @@ -11,7 +11,7 @@ module-sets: - go.opentelemetry.io/collector/config/configcompression - go.opentelemetry.io/collector/config/configretry beta: - version: v0.103.0 + version: v0.104.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder From 2c15bfafe191afb5a9f7c087061be546d4506324 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 2 Jul 2024 10:38:24 +0200 Subject: [PATCH 117/168] [chore][VERSIONING.md] Changing protocol support for security is allowed (#10460) #### Description We have recently discussed bumping the minimum TLS version to follow security best practices. Since we are about to stabilize `configtls` (see #10344), I raised the question of whether this would be a breaking change that should be done before 1.0. I argue that we should be allowed to do this after 1.0 because: - The Go 1 version compatibility doc states > Security. A security issue in the specification or implementation may come to light whose resolution requires breaking compatibility. We reserve the right to address such security issues. - The Go team has made [similar changes](https://github.com/golang/go/issues/45428) in the past for Go as a whole While this is not a security issue but a security best practice, the golang/go issue seems to indicate that changes like this would be in the spirit of the Go 1 version compatibility promise. --- VERSIONING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/VERSIONING.md b/VERSIONING.md index 43e4f65bce4..8da5ba3ba23 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -30,6 +30,7 @@ Unless otherwise specified in the documentation, the following may change in any change its output in any way. * **Go version compatibility**. Removing support for an unsupported Go version is not considered a breaking change. * **OS version compatibility**. Removing support for an unsupported OS version is not considered a breaking change. Upgrading or downgrading OS version support per the [platform support](docs/platform-support.md) document is not considered a breaking change. +* **Protocol compatibility**. Changing the default minimum version of a supported protocol (e.g. TLS) or dropping support for protocols when there are security concerns is not considered a breaking change. * **Dependency updates**. Updating dependencies is not considered a breaking change except when their types are part of the public API or the update may change the behavior of applications in an incompatible way. From 52bfb041ac1c55113eb925222ee7b18d5f5c401e Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 2 Jul 2024 04:29:31 -0600 Subject: [PATCH 118/168] [chore] Update release schedule (#10496) --- docs/release.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/release.md b/docs/release.md index bba9ef21777..8263765c9e8 100644 --- a/docs/release.md +++ b/docs/release.md @@ -160,8 +160,6 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR | Date | Version | Release manager | |------------|----------|---------------------------------------------------| -| 2024-06-17 | v0.103.0 | [@djaglowski](https://github.com/djaglowski) | -| 2024-07-01 | v0.104.0 | [@TylerHelmuth](https://github.com/TylerHelmuth) | | 2024-07-15 | v0.105.0 | [@atoulme](https://github.com/atoulme) | | 2024-07-29 | v0.106.0 | [@songy23](https://github.com/songy23) | | 2024-08-12 | v0.107.0 | [@dmitryax](https://github.com/dmitryax) | @@ -170,3 +168,5 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR | 2024-09-23 | v0.110.0 | [@jpkrohling](https://github.com/jpkrohling) | | 2024-10-07 | v0.111.0 | [@mx-psi](https://github.com/mx-psi) | | 2024-10-21 | v0.112.0 | [@evan-bradley](https://github.com/evan-bradley) | +| 2024-11-04 | v0.113.0 | [@djaglowski](https://github.com/djaglowski) | +| 2024-11-18 | v0.114.0 | [@TylerHelmuth](https://github.com/TylerHelmuth) | From 0337ad8e1f5e6e33ef8bb4b35b0929782670e6e6 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Tue, 2 Jul 2024 03:30:22 -0700 Subject: [PATCH 119/168] [configtls] mark module as stable (#10344) #### Description Mark module as stable. #### Link to tracking issue Fixes #9377 Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .chloggen/configtls_stable.yaml | 25 +++++++++++++++++++++++++ versions.yaml | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 .chloggen/configtls_stable.yaml diff --git a/.chloggen/configtls_stable.yaml b/.chloggen/configtls_stable.yaml new file mode 100644 index 00000000000..e1f5a6ccb7f --- /dev/null +++ b/.chloggen/configtls_stable.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: configtls + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Mark module as stable. + +# One or more tracking issues or pull requests related to the change +issues: [9377] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/versions.yaml b/versions.yaml index f61dbc00e9d..782277f7abe 100644 --- a/versions.yaml +++ b/versions.yaml @@ -10,6 +10,7 @@ module-sets: - go.opentelemetry.io/collector/config/configopaque - go.opentelemetry.io/collector/config/configcompression - go.opentelemetry.io/collector/config/configretry + - go.opentelemetry.io/collector/config/configtls beta: version: v0.104.0 modules: @@ -29,7 +30,6 @@ module-sets: - go.opentelemetry.io/collector/config/confighttp - go.opentelemetry.io/collector/config/confignet - go.opentelemetry.io/collector/config/configtelemetry - - go.opentelemetry.io/collector/config/configtls - go.opentelemetry.io/collector/config/internal - go.opentelemetry.io/collector/connector - go.opentelemetry.io/collector/connector/forwardconnector From 3a874ac8f0eea7a58c8c2cfd9acee5ce02bb192c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:01:01 +0200 Subject: [PATCH 120/168] Update module github.com/shirou/gopsutil/v4 to v4.24.6 (#10498) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/shirou/gopsutil/v4](https://togithub.com/shirou/gopsutil) | `v4.24.5` -> `v4.24.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.5/v4.24.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fshirou%2fgopsutil%2fv4/v4.24.5/v4.24.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
shirou/gopsutil (github.com/shirou/gopsutil/v4) ### [`v4.24.6`](https://togithub.com/shirou/gopsutil/compare/v4.24.5...v4.24.6) [Compare Source](https://togithub.com/shirou/gopsutil/compare/v4.24.5...v4.24.6)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- extension/ballastextension/go.mod | 2 +- extension/ballastextension/go.sum | 4 ++-- extension/memorylimiterextension/go.mod | 2 +- extension/memorylimiterextension/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- otelcol/go.mod | 2 +- otelcol/go.sum | 4 ++-- otelcol/otelcoltest/go.mod | 2 +- otelcol/otelcoltest/go.sum | 4 ++-- processor/memorylimiterprocessor/go.mod | 2 +- processor/memorylimiterprocessor/go.sum | 4 ++-- service/go.mod | 2 +- service/go.sum | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 7b53dfa788f..df16d47ca3e 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -71,7 +71,7 @@ require ( github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v4 v4.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 46e06caded3..8171e2ef6e9 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -114,8 +114,8 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= -github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= +github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index ca564eb83d6..324f1c8eb03 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -36,7 +36,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v4 v4.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index f8c64190fc5..3e9fcf6d20b 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -54,8 +54,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= -github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= +github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 089492904a9..e82d7f12422 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -35,7 +35,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v4 v4.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index f8c64190fc5..3e9fcf6d20b 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -54,8 +54,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= -github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= +github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= diff --git a/go.mod b/go.mod index 243f0466005..527397342b1 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ module go.opentelemetry.io/collector go 1.21.0 require ( - github.com/shirou/gopsutil/v4 v4.24.5 + github.com/shirou/gopsutil/v4 v4.24.6 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.104.0 go.opentelemetry.io/collector/confmap v0.104.0 diff --git a/go.sum b/go.sum index 58945fcad80..7a3f75ba0cf 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= -github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= +github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/otelcol/go.mod b/otelcol/go.mod index fc1e7ff860c..69f0d7f68e9 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -55,7 +55,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v4 v4.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index f1d6ea68a95..8616ba12df0 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -112,8 +112,8 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= -github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= +github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 89b1af05c27..80d14e7f739 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -51,7 +51,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v4 v4.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum index f1d6ea68a95..8616ba12df0 100644 --- a/otelcol/otelcoltest/go.sum +++ b/otelcol/otelcoltest/go.sum @@ -112,8 +112,8 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= -github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= +github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index f876f4ee8c8..f1d1256578d 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -39,7 +39,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect github.com/prometheus/procfs v0.15.0 // indirect - github.com/shirou/gopsutil/v4 v4.24.5 // indirect + github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 8974877be3f..9dae8a68004 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -63,8 +63,8 @@ github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= -github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= +github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/service/go.mod b/service/go.mod index e973b65efde..ffc85a6ab30 100644 --- a/service/go.mod +++ b/service/go.mod @@ -7,7 +7,7 @@ require ( github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.54.0 - github.com/shirou/gopsutil/v4 v4.24.5 + github.com/shirou/gopsutil/v4 v4.24.6 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.104.0 diff --git a/service/go.sum b/service/go.sum index 44371c86699..d92b97e5fc3 100644 --- a/service/go.sum +++ b/service/go.sum @@ -108,8 +108,8 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM= -github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= +github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= From fe60c0b7fa5a8f545a14055727829c67560f7784 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:04:58 +0200 Subject: [PATCH 121/168] Update All go.opentelemetry.io/collector packages to v0.104.0 (#10503) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [go.opentelemetry.io/collector/confmap/provider/envprovider](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.103.0` -> `v0.104.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/confmap/provider/fileprovider](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.103.0` -> `v0.104.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/exporter/otlpexporter](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.103.0` -> `v0.104.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/exporter/otlphttpexporter](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.103.0` -> `v0.104.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/collector/receiver/otlpreceiver](https://togithub.com/open-telemetry/opentelemetry-collector) | `v0.103.0` -> `v0.104.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.103.0/v0.104.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
open-telemetry/opentelemetry-collector (go.opentelemetry.io/collector/confmap/provider/envprovider) ### [`v0.104.0`](https://togithub.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v1110v01040) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector/compare/v0.103.0...v0.104.0) This release includes 2 very important breaking changes. 1. The `otlpreceiver` will now use `localhost` by default instead of `0.0.0.0`. This may break the receiver in containerized environments like Kubernetes. If you depend on `0.0.0.0` disable the `component.UseLocalHostAsDefaultHost` feature gate or explicitly set the endpoint to `0.0.0.0`. 2. Expansion of BASH-style environment variables, such as `$FOO` will no longer be supported by default. If you depend on this syntax, disable the `confmap.unifyEnvVarExpansion` feature gate, but know that the feature will be removed in the future in favor of `${env:FOO}`. ##### 🛑 Breaking changes 🛑 - `filter`: Remove deprecated `filter.CombinedFilter` ([#​10348](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10348)) - `otelcol`: By default, `otelcol.NewCommand` and `otelcol.NewCommandMustSetProvider` will set the `DefaultScheme` to `env`. ([#​10435](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10435)) - `expandconverter`: By default expandconverter will now error if it is about to expand `$FOO` syntax. Update configuration to use `${env:FOO}` instead or disable the `confmap.unifyEnvVarExpansion` feature gate. ([#​10435](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10435)) - `otlpreceiver`: Switch to `localhost` as the default for all endpoints. ([#​8510](https://togithub.com/open-telemetry/opentelemetry-collector/issues/8510)) Disable the `component.UseLocalHostAsDefaultHost` feature gate to temporarily get the previous default. ##### 💡 Enhancements 💡 - `confighttp`: Add support for cookies in HTTP clients with `cookies::enabled`. ([#​10175](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10175)) The method `confighttp.ToClient` will return a client with a `cookiejar.Jar` which will reuse cookies from server responses in subsequent requests. - `exporter/debug`: In `normal` verbosity, display one line of text for each telemetry record (log, data point, span) ([#​7806](https://togithub.com/open-telemetry/opentelemetry-collector/issues/7806)) - `exporter/debug`: Add option `use_internal_logger` ([#​10226](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10226)) - `configretry`: Mark module as stable. ([#​10279](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10279)) - `debugexporter`: Print Span.TraceState() when present. ([#​10421](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10421)) Enables viewing sampling threshold information (as by OTEP 235 samplers). - `processorhelper`: Add "inserted" metrics for processors. ([#​10353](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10353)) This includes the following metrics for processors: - `processor_inserted_spans` - `processor_inserted_metric_points` - `processor_inserted_log_records` ##### 🧰 Bug fixes 🧰 - `otlpexporter`: Update validation to support both dns:// and dns:/// ([#​10449](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10449)) - `service`: Fixed a bug that caused otel-collector to fail to start with ipv6 metrics endpoint service telemetry. ([#​10011](https://togithub.com/open-telemetry/opentelemetry-collector/issues/10011))
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- confmap/internal/e2e/go.mod | 4 ++-- internal/e2e/go.mod | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod index 7ba34d6de14..8ebcdd4800a 100644 --- a/confmap/internal/e2e/go.mod +++ b/confmap/internal/e2e/go.mod @@ -5,8 +5,8 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/confmap v0.104.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 ) diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 2461d29d6ae..4ac123e0aec 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -14,12 +14,12 @@ require ( go.opentelemetry.io/collector/confmap v0.104.0 go.opentelemetry.io/collector/consumer v0.104.0 go.opentelemetry.io/collector/exporter v0.104.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.104.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.0 go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.opentelemetry.io/collector/receiver v0.104.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.0 go.uber.org/goleak v1.3.0 ) From aaf092a7aa6d37cbb8cb92e6566c2a3784c3551a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 16:07:34 +0200 Subject: [PATCH 122/168] Update module github.com/prometheus/common to v0.55.0 (#10504) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/prometheus/common](https://togithub.com/prometheus/common) | `v0.54.0` -> `v0.55.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fprometheus%2fcommon/v0.55.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fprometheus%2fcommon/v0.55.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fprometheus%2fcommon/v0.54.0/v0.55.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fprometheus%2fcommon/v0.54.0/v0.55.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
prometheus/common (github.com/prometheus/common) ### [`v0.55.0`](https://togithub.com/prometheus/common/releases/tag/v0.55.0) [Compare Source](https://togithub.com/prometheus/common/compare/v0.54.0...v0.55.0) ##### What's Changed - Update Go modules by [@​SuperQ](https://togithub.com/SuperQ) in [https://github.com/prometheus/common/pull/643](https://togithub.com/prometheus/common/pull/643) - enable errcheck linter by [@​mmorel-35](https://togithub.com/mmorel-35) in [https://github.com/prometheus/common/pull/637](https://togithub.com/prometheus/common/pull/637) - Add a `RELEASE.md` and add [@​gotjosh](https://togithub.com/gotjosh) as a mantainer by [@​gotjosh](https://togithub.com/gotjosh) in [https://github.com/prometheus/common/pull/644](https://togithub.com/prometheus/common/pull/644) - Move goautoneg to external dependency by [@​mikelolasagasti](https://togithub.com/mikelolasagasti) in [https://github.com/prometheus/common/pull/625](https://togithub.com/prometheus/common/pull/625) - Expose secret as SecretReader and InlineSecret from config package by [@​pracucci](https://togithub.com/pracucci) in [https://github.com/prometheus/common/pull/650](https://togithub.com/prometheus/common/pull/650) - Fix HTTPClientConfig JSON marshalling by [@​pracucci](https://togithub.com/pracucci) in [https://github.com/prometheus/common/pull/651](https://togithub.com/prometheus/common/pull/651) - Expose secret as FileSecret from config package by [@​alanprot](https://togithub.com/alanprot) in [https://github.com/prometheus/common/pull/653](https://togithub.com/prometheus/common/pull/653) - Synchronize common files from prometheus/prometheus by [@​prombot](https://togithub.com/prombot) in [https://github.com/prometheus/common/pull/646](https://togithub.com/prometheus/common/pull/646) - Set http_headers to be omit empty by [@​yeya24](https://togithub.com/yeya24) in [https://github.com/prometheus/common/pull/655](https://togithub.com/prometheus/common/pull/655) - chore: add HumanizeTimestamp; make ConvertToFloat exportable by [@​freak12techno](https://togithub.com/freak12techno) in [https://github.com/prometheus/common/pull/654](https://togithub.com/prometheus/common/pull/654) - Bump github.com/aws/aws-sdk-go from 1.53.14 to 1.54.7 in /sigv4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/659](https://togithub.com/prometheus/common/pull/659) - Bump golang.org/x/oauth2 from 0.20.0 to 0.21.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/656](https://togithub.com/prometheus/common/pull/656) - Bump google.golang.org/protobuf from 1.34.1 to 1.34.2 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/658](https://togithub.com/prometheus/common/pull/658) - Bump golang.org/x/net from 0.25.0 to 0.26.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/prometheus/common/pull/657](https://togithub.com/prometheus/common/pull/657) - Synchronize common files from prometheus/prometheus by [@​prombot](https://togithub.com/prombot) in [https://github.com/prometheus/common/pull/660](https://togithub.com/prometheus/common/pull/660) - Add SigV4 FIPS STS endpoint config by [@​rajagopalanand](https://togithub.com/rajagopalanand) in [https://github.com/prometheus/common/pull/649](https://togithub.com/prometheus/common/pull/649) ##### New Contributors - [@​gotjosh](https://togithub.com/gotjosh) made their first contribution in [https://github.com/prometheus/common/pull/644](https://togithub.com/prometheus/common/pull/644) - [@​mikelolasagasti](https://togithub.com/mikelolasagasti) made their first contribution in [https://github.com/prometheus/common/pull/625](https://togithub.com/prometheus/common/pull/625) - [@​alanprot](https://togithub.com/alanprot) made their first contribution in [https://github.com/prometheus/common/pull/653](https://togithub.com/prometheus/common/pull/653) - [@​yeya24](https://togithub.com/yeya24) made their first contribution in [https://github.com/prometheus/common/pull/655](https://togithub.com/prometheus/common/pull/655) - [@​rajagopalanand](https://togithub.com/rajagopalanand) made their first contribution in [https://github.com/prometheus/common/pull/649](https://togithub.com/prometheus/common/pull/649) **Full Changelog**: https://github.com/prometheus/common/compare/v0.54.0...v0.55.0
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/mdatagen/go.mod | 9 +++++---- cmd/mdatagen/go.sum | 18 ++++++++++-------- cmd/otelcorecol/go.mod | 5 +++-- cmd/otelcorecol/go.sum | 10 ++++++---- component/go.mod | 11 ++++++----- component/go.sum | 22 ++++++++++++---------- config/configauth/go.mod | 6 +++--- config/configauth/go.sum | 22 ++++++++++++---------- config/configgrpc/go.mod | 11 ++++++----- config/configgrpc/go.sum | 22 ++++++++++++---------- config/confighttp/go.mod | 5 +++-- config/confighttp/go.sum | 10 ++++++---- connector/forwardconnector/go.mod | 11 ++++++----- connector/forwardconnector/go.sum | 22 ++++++++++++---------- connector/go.mod | 11 ++++++----- connector/go.sum | 22 ++++++++++++---------- exporter/debugexporter/go.mod | 9 +++++---- exporter/debugexporter/go.sum | 18 ++++++++++-------- exporter/go.mod | 9 +++++---- exporter/go.sum | 18 ++++++++++-------- exporter/loggingexporter/go.mod | 9 +++++---- exporter/loggingexporter/go.sum | 18 ++++++++++-------- exporter/nopexporter/go.mod | 9 +++++---- exporter/nopexporter/go.sum | 18 ++++++++++-------- exporter/otlpexporter/go.mod | 9 +++++---- exporter/otlpexporter/go.sum | 18 ++++++++++-------- exporter/otlphttpexporter/go.mod | 5 +++-- exporter/otlphttpexporter/go.sum | 10 ++++++---- extension/auth/go.mod | 11 ++++++----- extension/auth/go.sum | 22 ++++++++++++---------- extension/ballastextension/go.mod | 11 ++++++----- extension/ballastextension/go.sum | 22 ++++++++++++---------- extension/go.mod | 11 ++++++----- extension/go.sum | 22 ++++++++++++---------- extension/memorylimiterextension/go.mod | 11 ++++++----- extension/memorylimiterextension/go.sum | 22 ++++++++++++---------- extension/zpagesextension/go.mod | 5 +++-- extension/zpagesextension/go.sum | 10 ++++++---- go.mod | 11 ++++++----- go.sum | 22 ++++++++++++---------- internal/e2e/go.mod | 5 +++-- internal/e2e/go.sum | 10 ++++++---- otelcol/go.mod | 5 +++-- otelcol/go.sum | 10 ++++++---- otelcol/otelcoltest/go.mod | 5 +++-- otelcol/otelcoltest/go.sum | 10 ++++++---- processor/batchprocessor/go.mod | 11 ++++++----- processor/batchprocessor/go.sum | 22 ++++++++++++---------- processor/go.mod | 11 ++++++----- processor/go.sum | 22 ++++++++++++---------- processor/memorylimiterprocessor/go.mod | 11 ++++++----- processor/memorylimiterprocessor/go.sum | 22 ++++++++++++---------- receiver/go.mod | 11 ++++++----- receiver/go.sum | 22 ++++++++++++---------- receiver/nopreceiver/go.mod | 11 ++++++----- receiver/nopreceiver/go.sum | 22 ++++++++++++---------- receiver/otlpreceiver/go.mod | 5 +++-- receiver/otlpreceiver/go.sum | 10 ++++++---- service/go.mod | 5 +++-- service/go.sum | 10 ++++++---- 60 files changed, 438 insertions(+), 349 deletions(-) diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 48374a949d3..23bede9a095 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -41,17 +41,18 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 40898cf22fd..bd1c18cb4c7 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -44,16 +44,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -89,16 +91,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index df16d47ca3e..ba5d483d339 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -65,11 +65,12 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.3 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/rs/cors v1.10.1 // indirect github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 8171e2ef6e9..41498b6dc33 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -96,6 +96,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= @@ -105,10 +107,10 @@ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJL github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= diff --git a/component/go.mod b/component/go.mod index 530d95f560a..72ddf834d9d 100644 --- a/component/go.mod +++ b/component/go.mod @@ -5,7 +5,7 @@ go 1.21.0 require ( github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.1 - github.com/prometheus/common v0.54.0 + github.com/prometheus/common v0.55.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/config/configtelemetry v0.104.0 go.opentelemetry.io/collector/pdata v1.11.0 @@ -27,11 +27,12 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.14.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/component/go.sum b/component/go.sum index 12a53375081..92cdf8d2795 100644 --- a/component/go.sum +++ b/component/go.sum @@ -19,16 +19,18 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= @@ -62,20 +64,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 17baace3c83..b0b95f9a540 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -30,9 +30,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/config/configauth/go.sum b/config/configauth/go.sum index 59c1b968fcf..de47c1e6075 100644 --- a/config/configauth/go.sum +++ b/config/configauth/go.sum @@ -32,16 +32,18 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= @@ -75,20 +77,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 8be437cc87f..a40ddc8088d 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -45,11 +45,12 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect @@ -59,9 +60,9 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index 82748ff4e4c..70c151fb71d 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -50,16 +50,18 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -97,20 +99,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 1b097679fe6..ca6f72a8f3e 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -40,11 +40,12 @@ require ( github.com/knadh/koanf/v2 v2.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index 26df72c63ec..aeaf1990d0e 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -47,16 +47,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 844c91e0b96..f3bc69584c1 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -30,11 +30,12 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector v0.104.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect @@ -46,9 +47,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index 19b9e6a7e6d..bd1c18cb4c7 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -44,16 +44,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -89,20 +91,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/connector/go.mod b/connector/go.mod index 5b224c79847..10cad7aa201 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -25,11 +25,12 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel v1.27.0 // indirect @@ -38,9 +39,9 @@ require ( go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/connector/go.sum b/connector/go.sum index 2eb3a2c9f6c..9d95153ebbb 100644 --- a/connector/go.sum +++ b/connector/go.sum @@ -30,16 +30,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -75,20 +77,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 9b88b69b62d..97bdea3c988 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -34,11 +34,12 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector v0.104.0 // indirect go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect @@ -52,9 +53,9 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index 6b5766f0e92..c7cc4087d6e 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -46,16 +46,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -91,8 +93,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -103,8 +105,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/exporter/go.mod b/exporter/go.mod index 0c9da3fde58..fe87dccadb1 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -44,17 +44,18 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/go.sum b/exporter/go.sum index 6b5766f0e92..c7cc4087d6e 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -46,16 +46,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -91,8 +93,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -103,8 +105,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 617732fe4a0..dddb3e1ee88 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -33,11 +33,12 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector v0.104.0 // indirect go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect go.opentelemetry.io/collector/consumer v0.104.0 // indirect @@ -51,9 +52,9 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 6b5766f0e92..c7cc4087d6e 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -46,16 +46,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -91,8 +93,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -103,8 +105,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index 35723a899b9..b774c931ff7 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -30,11 +30,12 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect @@ -46,9 +47,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index 6b5766f0e92..c7cc4087d6e 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -46,16 +46,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -91,8 +93,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -103,8 +105,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 11466d19f0d..41fb823d56e 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -48,11 +48,12 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.3 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/confignet v0.104.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/config/internal v0.104.0 // indirect @@ -78,9 +79,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index dcd758b8ecb..cf31aa8fa17 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -56,16 +56,18 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -121,8 +123,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -133,8 +135,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 3a2922ba1e9..fe5b0092d38 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -46,11 +46,12 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/rs/cors v1.10.1 // indirect go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 56b8e4fce05..1074ceaf692 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -56,16 +56,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 2fccb15c665..7eaf07c65cc 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -24,11 +24,12 @@ require ( github.com/knadh/koanf/v2 v2.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect @@ -41,9 +42,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/extension/auth/go.sum b/extension/auth/go.sum index cf7efb1c39a..3e03920c8ef 100644 --- a/extension/auth/go.sum +++ b/extension/auth/go.sum @@ -33,16 +33,18 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= @@ -76,20 +78,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 324f1c8eb03..7278acc9004 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -30,12 +30,13 @@ require ( github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect @@ -50,9 +51,9 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index 3e9fcf6d20b..f474c52db6f 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -40,6 +40,8 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= @@ -48,10 +50,10 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= @@ -93,8 +95,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -105,12 +107,12 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/extension/go.mod b/extension/go.mod index 9491e766a5b..36d56c0716d 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -24,11 +24,12 @@ require ( github.com/knadh/koanf/v2 v2.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect @@ -40,9 +41,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/extension/go.sum b/extension/go.sum index 7d70b077386..fed85a2a181 100644 --- a/extension/go.sum +++ b/extension/go.sum @@ -35,16 +35,18 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= @@ -78,20 +80,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index e82d7f12422..833a95888f1 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -29,12 +29,13 @@ require ( github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect @@ -49,9 +50,9 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index 3e9fcf6d20b..f474c52db6f 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -40,6 +40,8 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= @@ -48,10 +50,10 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= @@ -93,8 +95,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -105,12 +107,12 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 4f2cdc8b393..6aac95fbfff 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -38,11 +38,12 @@ require ( github.com/knadh/koanf/v2 v2.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/rs/cors v1.10.1 // indirect go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect go.opentelemetry.io/collector/config/configopaque v1.11.0 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index f99258b79f4..e4adad0e7e2 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -53,16 +53,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= diff --git a/go.mod b/go.mod index 527397342b1..086621c46ca 100644 --- a/go.mod +++ b/go.mod @@ -47,12 +47,13 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect @@ -72,9 +73,9 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/go.sum b/go.sum index 7a3f75ba0cf..605d870dd57 100644 --- a/go.sum +++ b/go.sum @@ -51,6 +51,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= @@ -59,10 +61,10 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= @@ -124,8 +126,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -136,12 +138,12 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 4ac123e0aec..d100a44917f 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -48,11 +48,12 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.3 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/rs/cors v1.10.1 // indirect go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index dffd34940e9..69fc0bb01c3 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -58,16 +58,18 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= diff --git a/otelcol/go.mod b/otelcol/go.mod index 69f0d7f68e9..1f2d80b0246 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -49,12 +49,13 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index 8616ba12df0..abb065f6b80 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -94,6 +94,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= @@ -103,10 +105,10 @@ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJL github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 80d14e7f739..0259adae125 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -45,12 +45,13 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.8.1 // indirect diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum index 8616ba12df0..abb065f6b80 100644 --- a/otelcol/otelcoltest/go.sum +++ b/otelcol/otelcoltest/go.sum @@ -94,6 +94,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= @@ -103,10 +105,10 @@ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJL github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index c34deff309f..f31a1250f8e 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -38,19 +38,20 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index 19b9e6a7e6d..bd1c18cb4c7 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -44,16 +44,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -89,20 +91,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/processor/go.mod b/processor/go.mod index d8ed158ae15..40d42b3ddcd 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -29,18 +29,19 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect go.opentelemetry.io/otel/sdk v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/processor/go.sum b/processor/go.sum index 2eb3a2c9f6c..9d95153ebbb 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -30,16 +30,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -75,20 +77,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index f1d1256578d..ca7bf9d2d88 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -33,12 +33,13 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect @@ -55,9 +56,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 9dae8a68004..9b6f8714e8e 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -49,6 +49,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= @@ -57,10 +59,10 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= @@ -104,8 +106,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -116,12 +118,12 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/receiver/go.mod b/receiver/go.mod index a14e04eb80c..bf6629abf2e 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -30,15 +30,16 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/receiver/go.sum b/receiver/go.sum index 2eb3a2c9f6c..9d95153ebbb 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -30,16 +30,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -75,20 +77,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index e3eae609021..d28cda7edb7 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -29,11 +29,12 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect @@ -45,9 +46,9 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/receiver/nopreceiver/go.sum b/receiver/nopreceiver/go.sum index 19b9e6a7e6d..bd1c18cb4c7 100644 --- a/receiver/nopreceiver/go.sum +++ b/receiver/nopreceiver/go.sum @@ -44,16 +44,18 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -89,20 +91,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 1a0a1aeb8f6..96707949037 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -47,11 +47,12 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.3 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/rs/cors v1.10.1 // indirect go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index dffd34940e9..69fc0bb01c3 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -58,16 +58,18 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= diff --git a/service/go.mod b/service/go.mod index ffc85a6ab30..402b9bc4371 100644 --- a/service/go.mod +++ b/service/go.mod @@ -6,7 +6,7 @@ require ( github.com/google/uuid v1.6.0 github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.1 - github.com/prometheus/common v0.54.0 + github.com/prometheus/common v0.55.0 github.com/shirou/gopsutil/v4 v4.24.6 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 @@ -70,9 +70,10 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/procfs v0.15.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/rs/cors v1.10.1 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect diff --git a/service/go.sum b/service/go.sum index d92b97e5fc3..dfb52da16fc 100644 --- a/service/go.sum +++ b/service/go.sum @@ -91,6 +91,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= @@ -100,10 +102,10 @@ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJL github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.15.0 h1:A82kmvXJq2jTu5YUhSGNlYoxh85zLnKgPz4bMZgI5Ek= -github.com/prometheus/procfs v0.15.0/go.mod h1:Y0RJ/Y5g5wJpkTisOtqwDSo4HwhGmLB4VQSw2sQJLHk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= From 1fa399beecc97479a1961998c1dfe957fa887e31 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 08:10:06 -0700 Subject: [PATCH 123/168] Update github/codeql-action action to v3.25.11 (#10497) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github/codeql-action](https://togithub.com/github/codeql-action) | action | patch | `v3.25.10` -> `v3.25.11` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
github/codeql-action (github/codeql-action) ### [`v3.25.11`](https://togithub.com/github/codeql-action/compare/v3.25.10...v3.25.11) [Compare Source](https://togithub.com/github/codeql-action/compare/v3.25.10...v3.25.11)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecard.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index dc165869b8d..38cd883c767 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,12 +30,12 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 + uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 with: languages: go - name: Autobuild - uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 + uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 + uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index e6a8986c378..b05abb49294 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -64,6 +64,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 with: sarif_file: results.sarif From c6e3c4e95fc739b5f8624f2fb11b4835ac9cdac3 Mon Sep 17 00:00:00 2001 From: Roger Coll Date: Tue, 2 Jul 2024 18:08:54 +0200 Subject: [PATCH 124/168] fix: remove extra closing parenthesis in sub-config error (#10479) #### Description Removed an extra closing parenthesis. This corrects the formatting of the error message for unexpected sub-config value kinds. Found in: https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33268/files#diff-9137db5fde5eb0d6870425c0023cec1a5bdfe92f58f8a72e278b55635afc6e95R48 --- .chloggen/fix_error_format.yaml | 25 +++++++++++++++++++++++++ confmap/confmap.go | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 .chloggen/fix_error_format.yaml diff --git a/.chloggen/fix_error_format.yaml b/.chloggen/fix_error_format.yaml new file mode 100644 index 00000000000..0611b09454c --- /dev/null +++ b/.chloggen/fix_error_format.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'enhancement' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confmap + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove extra closing parenthesis in sub-config error + +# One or more tracking issues or pull requests related to the change +issues: [10480] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/confmap/confmap.go b/confmap/confmap.go index f24d12de17f..62c8fdd6068 100644 --- a/confmap/confmap.go +++ b/confmap/confmap.go @@ -137,7 +137,7 @@ func (l *Conf) Sub(key string) (*Conf, error) { return NewFromStringMap(v), nil } - return nil, fmt.Errorf("unexpected sub-config value kind for key:%s value:%v kind:%v)", key, data, reflect.TypeOf(data).Kind()) + return nil, fmt.Errorf("unexpected sub-config value kind for key:%s value:%v kind:%v", key, data, reflect.TypeOf(data).Kind()) } // ToStringMap creates a map[string]any from a Parser. From 2a547becccef5b5612462acf0ab3f2ba01559881 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 09:57:42 -0700 Subject: [PATCH 125/168] Update module github.com/knadh/koanf/providers/file to v1 (#10505) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/knadh/koanf/providers/file](https://togithub.com/knadh/koanf) | `v0.1.0` -> `v1.0.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fknadh%2fkoanf%2fproviders%2ffile/v1.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fknadh%2fkoanf%2fproviders%2ffile/v1.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fknadh%2fkoanf%2fproviders%2ffile/v0.1.0/v1.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fknadh%2fkoanf%2fproviders%2ffile/v0.1.0/v1.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. :warning: MAJOR VERSION UPDATE :warning: - please manually update this package --- ### Release Notes
knadh/koanf (github.com/knadh/koanf/providers/file) ### [`v1.0.0`](https://togithub.com/knadh/koanf/releases/tag/v1.0.0) [Compare Source](https://togithub.com/knadh/koanf/compare/v0.1.0...v1.0.0) - [`deea8ad`](https://togithub.com/knadh/koanf/commit/deea8ad) Upgrade deps
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/builder/go.mod | 4 ++-- cmd/builder/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod index c123a51656c..df6ce76a4f0 100644 --- a/cmd/builder/go.mod +++ b/cmd/builder/go.mod @@ -9,7 +9,7 @@ require ( github.com/hashicorp/go-version v1.7.0 github.com/knadh/koanf/parsers/yaml v0.1.0 github.com/knadh/koanf/providers/env v0.1.0 - github.com/knadh/koanf/providers/file v0.1.0 + github.com/knadh/koanf/providers/file v1.0.0 github.com/knadh/koanf/providers/fs v0.1.0 github.com/knadh/koanf/v2 v2.1.1 github.com/spf13/cobra v1.8.1 @@ -32,7 +32,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.21.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/cmd/builder/go.sum b/cmd/builder/go.sum index 9b4a5ff398e..175d6a59cf1 100644 --- a/cmd/builder/go.sum +++ b/cmd/builder/go.sum @@ -16,8 +16,8 @@ github.com/knadh/koanf/parsers/yaml v0.1.0 h1:ZZ8/iGfRLvKSaMEECEBPM1HQslrZADk8fP github.com/knadh/koanf/parsers/yaml v0.1.0/go.mod h1:cvbUDC7AL23pImuQP0oRw/hPuccrNBS2bps8asS0CwY= github.com/knadh/koanf/providers/env v0.1.0 h1:LqKteXqfOWyx5Ab9VfGHmjY9BvRXi+clwyZozgVRiKg= github.com/knadh/koanf/providers/env v0.1.0/go.mod h1:RE8K9GbACJkeEnkl8L/Qcj8p4ZyPXZIQ191HJi44ZaQ= -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/file v1.0.0 h1:DtPvSQBeF+N0QLPMz0yf2bx0nFSxUcncpqQvzCxfCyk= +github.com/knadh/koanf/providers/file v1.0.0/go.mod h1:/faSBcv2mxPVjFrXck95qeoyoZ5myJ6uxN8OOVNJJCI= github.com/knadh/koanf/providers/fs v0.1.0 h1:9Hln9GS3bWTItAnGVFYyfkoAIxAFq7pvlF64pTNiDdQ= github.com/knadh/koanf/providers/fs v0.1.0/go.mod h1:Cva1yH8NBxkEeVZx8CUmF5TunbgO72E+GwqDbqpP2sE= github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= @@ -54,8 +54,8 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 46e4380815167d9d0ceba99ff518dd60f441e255 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:33:59 -0600 Subject: [PATCH 126/168] [otelcoltest] remove deprecated functions (#10512) --- .chloggen/remove-deprecated-methods.yaml | 25 ++++++++++++++++++++++++ otelcol/otelcoltest/config.go | 23 ---------------------- 2 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 .chloggen/remove-deprecated-methods.yaml diff --git a/.chloggen/remove-deprecated-methods.yaml b/.chloggen/remove-deprecated-methods.yaml new file mode 100644 index 00000000000..dd72accd6b7 --- /dev/null +++ b/.chloggen/remove-deprecated-methods.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcoltest + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove deprecated methods `LoadConfigWithSettings` and `LoadConfigAndValidateWithSettings` + +# One or more tracking issues or pull requests related to the change +issues: [10512] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/otelcol/otelcoltest/config.go b/otelcol/otelcoltest/config.go index cbc0be024f4..299ee647c91 100644 --- a/otelcol/otelcoltest/config.go +++ b/otelcol/otelcoltest/config.go @@ -15,18 +15,6 @@ import ( "go.opentelemetry.io/collector/otelcol" ) -// LoadConfigWithSettings loads a config.Config from the provider settings, and does NOT validate the configuration. -// -// Deprecated: [v0.104.0] Use LoadConfig instead -func LoadConfigWithSettings(factories otelcol.Factories, set otelcol.ConfigProviderSettings) (*otelcol.Config, error) { - // Read yaml config from file - provider, err := otelcol.NewConfigProvider(set) - if err != nil { - return nil, err - } - return provider.Get(context.Background(), factories) -} - // LoadConfig loads a config.Config from file, and does NOT validate the configuration. func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config, error) { provider, err := otelcol.NewConfigProvider(otelcol.ConfigProviderSettings{ @@ -47,17 +35,6 @@ func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config, return provider.Get(context.Background(), factories) } -// LoadConfigAndValidateWithSettings loads a config from the provider settings, and validates the configuration. -// -// Deprecated: [v0.104.0] Use LoadConfigAndValidate instead -func LoadConfigAndValidateWithSettings(factories otelcol.Factories, set otelcol.ConfigProviderSettings) (*otelcol.Config, error) { - cfg, err := LoadConfigWithSettings(factories, set) - if err != nil { - return nil, err - } - return cfg, cfg.Validate() -} - // LoadConfigAndValidate loads a config from the file, and validates the configuration. func LoadConfigAndValidate(fileName string, factories otelcol.Factories) (*otelcol.Config, error) { cfg, err := LoadConfig(fileName, factories) From 428d3f814326614fe6c6bec14ed088951c516bc4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 10:34:10 -0700 Subject: [PATCH 127/168] fix(deps): update module google.golang.org/grpc to v1.65.0 (#10513) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google.golang.org/grpc](https://togithub.com/grpc/grpc-go) | `v1.64.0` -> `v1.65.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/google.golang.org%2fgrpc/v1.65.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/google.golang.org%2fgrpc/v1.65.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/google.golang.org%2fgrpc/v1.64.0/v1.65.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/google.golang.org%2fgrpc/v1.64.0/v1.65.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
grpc/grpc-go (google.golang.org/grpc) ### [`v1.65.0`](https://togithub.com/grpc/grpc-go/releases/tag/v1.65.0): Release 1.65.0 [Compare Source](https://togithub.com/grpc/grpc-go/compare/v1.64.0...v1.65.0) ### Dependencies - Change support policy to cover only the latest TWO releases of Go, matching the policy for Go itself. See [#​7249](https://togithub.com/grpc/grpc-go/issues/7249) for more information. ([#​7250](https://togithub.com/grpc/grpc-go/issues/7250)) - Update x/net/http2 to address [CVE-2023-45288](https://nvd.nist.gov/vuln/detail/CVE-2023-45288) ([#​7282](https://togithub.com/grpc/grpc-go/issues/7282)) ### Behavior Changes - credentials/tls: clients and servers will now reject connections that don't support ALPN when environment variable `GRPC_ENFORCE_ALPN_ENABLED` is set to "true" (case insensitive). ([#​7184](https://togithub.com/grpc/grpc-go/issues/7184)) - NOTE: this behavior will become the default in a future release. - metadata: remove String method from MD to make printing more consistent ([#​7373](https://togithub.com/grpc/grpc-go/issues/7373)) ### New Features - grpc: add `WithMaxCallAttempts` to configure gRPC's retry behavior per-channel. ([#​7229](https://togithub.com/grpc/grpc-go/issues/7229)) - Special Thanks: [@​imoore76](https://togithub.com/imoore76) ### Bug Fixes - ringhash: properly apply endpoint weights instead of ignoring them ([#​7156](https://togithub.com/grpc/grpc-go/issues/7156)) - xds: fix a bug that could cause xds-enabled servers to stop accepting new connections after handshaking errors ([#​7128](https://togithub.com/grpc/grpc-go/issues/7128)) - Special Thanks: [@​bozaro](https://togithub.com/bozaro)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/mdatagen/go.mod | 4 ++-- cmd/mdatagen/go.sum | 8 ++++---- cmd/otelcorecol/go.mod | 6 +++--- cmd/otelcorecol/go.sum | 12 ++++++------ component/go.mod | 4 ++-- component/go.sum | 8 ++++---- config/configauth/go.mod | 4 ++-- config/configauth/go.sum | 8 ++++---- config/configgrpc/go.mod | 4 ++-- config/configgrpc/go.sum | 8 ++++---- config/confighttp/go.mod | 4 ++-- config/confighttp/go.sum | 8 ++++---- connector/forwardconnector/go.mod | 4 ++-- connector/forwardconnector/go.sum | 8 ++++---- connector/go.mod | 4 ++-- connector/go.sum | 8 ++++---- consumer/go.mod | 10 +++++----- consumer/go.sum | 20 ++++++++++---------- exporter/debugexporter/go.mod | 4 ++-- exporter/debugexporter/go.sum | 8 ++++---- exporter/go.mod | 4 ++-- exporter/go.sum | 8 ++++---- exporter/loggingexporter/go.mod | 4 ++-- exporter/loggingexporter/go.sum | 8 ++++---- exporter/nopexporter/go.mod | 4 ++-- exporter/nopexporter/go.sum | 8 ++++---- exporter/otlpexporter/go.mod | 6 +++--- exporter/otlpexporter/go.sum | 12 ++++++------ exporter/otlphttpexporter/go.mod | 6 +++--- exporter/otlphttpexporter/go.sum | 12 ++++++------ extension/auth/go.mod | 4 ++-- extension/auth/go.sum | 8 ++++---- extension/ballastextension/go.mod | 4 ++-- extension/ballastextension/go.sum | 8 ++++---- extension/go.mod | 4 ++-- extension/go.sum | 8 ++++---- extension/memorylimiterextension/go.mod | 4 ++-- extension/memorylimiterextension/go.sum | 8 ++++---- extension/zpagesextension/go.mod | 6 +++--- extension/zpagesextension/go.sum | 12 ++++++------ go.mod | 6 +++--- go.sum | 12 ++++++------ internal/e2e/go.mod | 6 +++--- internal/e2e/go.sum | 12 ++++++------ otelcol/go.mod | 6 +++--- otelcol/go.sum | 12 ++++++------ otelcol/otelcoltest/go.mod | 6 +++--- otelcol/otelcoltest/go.sum | 12 ++++++------ pdata/go.mod | 10 +++++----- pdata/go.sum | 20 ++++++++++---------- pdata/pprofile/go.mod | 10 +++++----- pdata/pprofile/go.sum | 20 ++++++++++---------- pdata/testdata/go.mod | 10 +++++----- pdata/testdata/go.sum | 20 ++++++++++---------- processor/batchprocessor/go.mod | 4 ++-- processor/batchprocessor/go.sum | 8 ++++---- processor/go.mod | 4 ++-- processor/go.sum | 8 ++++---- processor/memorylimiterprocessor/go.mod | 4 ++-- processor/memorylimiterprocessor/go.sum | 8 ++++---- receiver/go.mod | 4 ++-- receiver/go.sum | 8 ++++---- receiver/nopreceiver/go.mod | 4 ++-- receiver/nopreceiver/go.sum | 8 ++++---- receiver/otlpreceiver/go.mod | 6 +++--- receiver/otlpreceiver/go.sum | 12 ++++++------ service/go.mod | 6 +++--- service/go.sum | 12 ++++++------ 68 files changed, 270 insertions(+), 270 deletions(-) diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 23bede9a095..6d4bf723a0c 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -53,8 +53,8 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index bd1c18cb4c7..245e3c22809 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -113,10 +113,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index ba5d483d339..9d251c6bbf6 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -123,9 +123,9 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 41498b6dc33..baabec8cdec 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -252,17 +252,17 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/component/go.mod b/component/go.mod index 72ddf834d9d..54edd040c52 100644 --- a/component/go.mod +++ b/component/go.mod @@ -33,8 +33,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/component/go.sum b/component/go.sum index 92cdf8d2795..35496fcd7de 100644 --- a/component/go.sum +++ b/component/go.sum @@ -86,10 +86,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/config/configauth/go.mod b/config/configauth/go.mod index b0b95f9a540..97146524dd7 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -33,8 +33,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/config/configauth/go.sum b/config/configauth/go.sum index de47c1e6075..88ab5d48ad7 100644 --- a/config/configauth/go.sum +++ b/config/configauth/go.sum @@ -99,10 +99,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index a40ddc8088d..5946d36fd47 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -22,7 +22,7 @@ require ( go.opentelemetry.io/otel v1.27.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.64.0 + google.golang.org/grpc v1.65.0 ) require ( @@ -63,7 +63,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index 70c151fb71d..4adedfe26ae 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -121,10 +121,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index ca6f72a8f3e..2d9ad26a278 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -57,8 +57,8 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index aeaf1990d0e..d58971df3d1 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -118,10 +118,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index f3bc69584c1..cd0371971c5 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -50,8 +50,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index bd1c18cb4c7..245e3c22809 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -113,10 +113,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/connector/go.mod b/connector/go.mod index 10cad7aa201..fec0181be26 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -42,8 +42,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/connector/go.sum b/connector/go.sum index 9d95153ebbb..a10535cdd1b 100644 --- a/connector/go.sum +++ b/connector/go.sum @@ -99,10 +99,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/consumer/go.mod b/consumer/go.mod index b18e42b8c6d..263d4c9063e 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -18,11 +18,11 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect - google.golang.org/grpc v1.64.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/consumer/go.sum b/consumer/go.sum index ff7072f4244..528166b78c0 100644 --- a/consumer/go.sum +++ b/consumer/go.sum @@ -42,20 +42,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -64,10 +64,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 97bdea3c988..7d7c023caac 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -56,8 +56,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index c7cc4087d6e..ca473c203d8 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -115,10 +115,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/exporter/go.mod b/exporter/go.mod index fe87dccadb1..d879ec7cc4d 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -24,7 +24,7 @@ require ( go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/sys v0.21.0 - google.golang.org/grpc v1.64.0 + google.golang.org/grpc v1.65.0 ) require ( @@ -56,7 +56,7 @@ require ( go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/go.sum b/exporter/go.sum index c7cc4087d6e..ca473c203d8 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -115,10 +115,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index dddb3e1ee88..bd2d18075d7 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -55,8 +55,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index c7cc4087d6e..ca473c203d8 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -115,10 +115,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index b774c931ff7..63916169bf0 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -50,8 +50,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index c7cc4087d6e..ca473c203d8 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -115,10 +115,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 41fb823d56e..04e3660757d 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -19,8 +19,8 @@ require ( go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 - google.golang.org/grpc v1.64.0 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 + google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 ) @@ -82,7 +82,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index cf31aa8fa17..ba5f2e58e36 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -145,12 +145,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index fe5b0092d38..bc8fc406c74 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -17,8 +17,8 @@ require ( go.opentelemetry.io/collector/pdata v1.11.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 - google.golang.org/grpc v1.64.0 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 + google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 ) @@ -80,7 +80,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 1074ceaf692..d2bfed0ad39 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -147,12 +147,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 7eaf07c65cc..1672e9c9926 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -7,7 +7,7 @@ require ( go.opentelemetry.io/collector/component v0.104.0 go.opentelemetry.io/collector/extension v0.104.0 go.uber.org/goleak v1.3.0 - google.golang.org/grpc v1.64.0 + google.golang.org/grpc v1.65.0 ) require ( @@ -45,7 +45,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/auth/go.sum b/extension/auth/go.sum index 3e03920c8ef..08c66e3a14b 100644 --- a/extension/auth/go.sum +++ b/extension/auth/go.sum @@ -100,10 +100,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 7278acc9004..c7ecdae789d 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -54,8 +54,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index f474c52db6f..79e3223f0bd 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -121,10 +121,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/extension/go.mod b/extension/go.mod index 36d56c0716d..2006fbbacd5 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -44,8 +44,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/go.sum b/extension/go.sum index fed85a2a181..d5afd904b86 100644 --- a/extension/go.sum +++ b/extension/go.sum @@ -102,10 +102,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 833a95888f1..a1ffadf4023 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -53,8 +53,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index f474c52db6f..79e3223f0bd 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -121,10 +121,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 6aac95fbfff..b1b2bacf51d 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -71,9 +71,9 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index e4adad0e7e2..4f0699f3b9a 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -144,12 +144,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/go.mod b/go.mod index 086621c46ca..d9055d27488 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.64.0 + google.golang.org/grpc v1.65.0 ) require ( @@ -76,8 +76,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 605d870dd57..814eca57727 100644 --- a/go.sum +++ b/go.sum @@ -152,12 +152,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index d100a44917f..b07915efad4 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -86,9 +86,9 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 69fc0bb01c3..94dec360f54 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -151,12 +151,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/otelcol/go.mod b/otelcol/go.mod index 1f2d80b0246..fd88e6dca1d 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -21,7 +21,7 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 golang.org/x/sys v0.21.0 - google.golang.org/grpc v1.64.0 + google.golang.org/grpc v1.65.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -88,8 +88,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect google.golang.org/protobuf v1.34.2 // indirect ) diff --git a/otelcol/go.sum b/otelcol/go.sum index abb065f6b80..5af48f58373 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -248,17 +248,17 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 0259adae125..dec9d0cdc04 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -92,9 +92,9 @@ require ( golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum index abb065f6b80..5af48f58373 100644 --- a/otelcol/otelcoltest/go.sum +++ b/otelcol/otelcoltest/go.sum @@ -248,17 +248,17 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/pdata/go.mod b/pdata/go.mod index 09a353fd198..0bedaefc0fe 100644 --- a/pdata/go.mod +++ b/pdata/go.mod @@ -8,7 +8,7 @@ require ( github.com/stretchr/testify v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 - google.golang.org/grpc v1.64.0 + google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 ) @@ -19,10 +19,10 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pdata/go.sum b/pdata/go.sum index be243103fda..84ebb984c67 100644 --- a/pdata/go.sum +++ b/pdata/go.sum @@ -48,20 +48,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -70,10 +70,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod index 60b24e88038..b955721f854 100644 --- a/pdata/pprofile/go.mod +++ b/pdata/pprofile/go.mod @@ -15,11 +15,11 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect - google.golang.org/grpc v1.64.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pdata/pprofile/go.sum b/pdata/pprofile/go.sum index 5a85f63bae2..91090cc782f 100644 --- a/pdata/pprofile/go.sum +++ b/pdata/pprofile/go.sum @@ -32,20 +32,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -54,10 +54,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pdata/testdata/go.mod b/pdata/testdata/go.mod index 8e064fada79..bdddb22c86f 100644 --- a/pdata/testdata/go.mod +++ b/pdata/testdata/go.mod @@ -13,11 +13,11 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect - google.golang.org/grpc v1.64.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect ) diff --git a/pdata/testdata/go.sum b/pdata/testdata/go.sum index a2e9971059c..29738983fee 100644 --- a/pdata/testdata/go.sum +++ b/pdata/testdata/go.sum @@ -36,20 +36,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -58,10 +58,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index f31a1250f8e..2f541f7f788 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -52,8 +52,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index bd1c18cb4c7..245e3c22809 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -113,10 +113,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/processor/go.mod b/processor/go.mod index 40d42b3ddcd..a5c683e9c02 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -42,8 +42,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/go.sum b/processor/go.sum index 9d95153ebbb..a10535cdd1b 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -99,10 +99,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index ca7bf9d2d88..6b8dbad8b08 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -59,8 +59,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 9b6f8714e8e..d3c2e75ed45 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -132,10 +132,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/receiver/go.mod b/receiver/go.mod index bf6629abf2e..70c7fb8737f 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -40,8 +40,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/go.sum b/receiver/go.sum index 9d95153ebbb..a10535cdd1b 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -99,10 +99,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index d28cda7edb7..b368ce3039a 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -49,8 +49,8 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/nopreceiver/go.sum b/receiver/nopreceiver/go.sum index bd1c18cb4c7..245e3c22809 100644 --- a/receiver/nopreceiver/go.sum +++ b/receiver/nopreceiver/go.sum @@ -113,10 +113,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 96707949037..4c5588e4e6b 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -19,8 +19,8 @@ require ( go.opentelemetry.io/collector/receiver v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 - google.golang.org/grpc v1.64.0 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 + google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 ) @@ -84,7 +84,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 69fc0bb01c3..94dec360f54 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -151,12 +151,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/service/go.mod b/service/go.mod index 402b9bc4371..49980150161 100644 --- a/service/go.mod +++ b/service/go.mod @@ -96,9 +96,9 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect - google.golang.org/grpc v1.64.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/service/go.sum b/service/go.sum index dfb52da16fc..1b59c2e81e9 100644 --- a/service/go.sum +++ b/service/go.sum @@ -240,17 +240,17 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1:Q2RxlXqh1cgzzUgV261vBO2jI5R/3DD1J2pM0nI4NhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 6ad6b868161095d5f5292839a2a2edfa1792d591 Mon Sep 17 00:00:00 2001 From: Tania Pham Date: Tue, 2 Jul 2024 10:47:09 -0700 Subject: [PATCH 128/168] Change default otlp exporter GRPC load balancer to round robin (#10319) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Description Updates the default `pick_first` load balancer to `round_robin`, which allows for better resource allocation and less chances of throttling data being sent to addresses. #### Link to tracking issue Fixes #10298 (has full context of this PR) #### Testing Edited tests to allow round_robin load balancing. --------- Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Juraci Paixão Kröhling --- .chloggen/load-balancer-round-robin.yaml | 24 ++++++++++++++++++++++++ config/configgrpc/README.md | 4 ++-- config/configgrpc/configgrpc.go | 12 +++++++++--- config/configgrpc/configgrpc_test.go | 9 +++++---- 4 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 .chloggen/load-balancer-round-robin.yaml diff --git a/.chloggen/load-balancer-round-robin.yaml b/.chloggen/load-balancer-round-robin.yaml new file mode 100644 index 00000000000..1b9a711b7de --- /dev/null +++ b/.chloggen/load-balancer-round-robin.yaml @@ -0,0 +1,24 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: configgrpc + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Update the default load balancer strategy to round_robin + +# One or more tracking issues or pull requests related to the change +issues: [10319] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: To restore the behavior that was previously the default, set `balancer_name` to `pick_first`. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +change_logs: [user] \ No newline at end of file diff --git a/config/configgrpc/README.md b/config/configgrpc/README.md index b9cf2f01be2..e0db0421e7e 100644 --- a/config/configgrpc/README.md +++ b/config/configgrpc/README.md @@ -15,8 +15,8 @@ configuration parameters are also defined under `tls` like server configuration. For more information, see [configtls README](../configtls/README.md). -- [`balancer_name`](https://github.com/grpc/grpc-go/blob/master/examples/features/load_balancing/README.md) -- `compression` Compression type to use among `gzip`, `snappy`, `zstd`, and `none`. +- [`balancer_name`](https://github.com/grpc/grpc-go/blob/master/examples/features/load_balancing/README.md): Default before v0.103.0 is `pick_first`, default for v0.103.0 is `round_robin`. See [issue](https://github.com/open-telemetry/opentelemetry-collector/issues/10298). To restore the previous behavior, set `balancer_name` to `pick_first`. +- `compression`: Compression type to use among `gzip`, `snappy`, `zstd`, and `none`. - `endpoint`: Valid value syntax available [here](https://github.com/grpc/grpc/blob/master/doc/naming.md) - [`tls`](../configtls/README.md) - `headers`: name/value pairs added to the request diff --git a/config/configgrpc/configgrpc.go b/config/configgrpc/configgrpc.go index 87e7b83d766..73176c9dec9 100644 --- a/config/configgrpc/configgrpc.go +++ b/config/configgrpc/configgrpc.go @@ -55,6 +55,11 @@ func NewDefaultKeepaliveClientConfig() *KeepaliveClientConfig { } } +// BalancerName returns a string with default load balancer value +func BalancerName() string { + return "round_robin" +} + // ClientConfig defines common settings for a gRPC client configuration. type ClientConfig struct { // The target to which the exporter is going to send traces or metrics, @@ -102,9 +107,10 @@ type ClientConfig struct { // NewDefaultClientConfig returns a new instance of ClientConfig with default values. func NewDefaultClientConfig() *ClientConfig { return &ClientConfig{ - TLSSetting: configtls.NewDefaultClientConfig(), - Keepalive: NewDefaultKeepaliveClientConfig(), - Auth: configauth.NewDefaultAuthentication(), + TLSSetting: configtls.NewDefaultClientConfig(), + Keepalive: NewDefaultKeepaliveClientConfig(), + Auth: configauth.NewDefaultAuthentication(), + BalancerName: BalancerName(), } } diff --git a/config/configgrpc/configgrpc_test.go b/config/configgrpc/configgrpc_test.go index 010c415a441..0b2b1cf4cd2 100644 --- a/config/configgrpc/configgrpc_test.go +++ b/config/configgrpc/configgrpc_test.go @@ -48,9 +48,10 @@ func TestNewDefaultKeepaliveClientConfig(t *testing.T) { func TestNewDefaultClientConfig(t *testing.T) { expected := &ClientConfig{ - TLSSetting: configtls.NewDefaultClientConfig(), - Keepalive: NewDefaultKeepaliveClientConfig(), - Auth: configauth.NewDefaultAuthentication(), + TLSSetting: configtls.NewDefaultClientConfig(), + Keepalive: NewDefaultKeepaliveClientConfig(), + Auth: configauth.NewDefaultAuthentication(), + BalancerName: BalancerName(), } result := NewDefaultClientConfig() @@ -215,7 +216,7 @@ func TestAllGrpcClientSettings(t *testing.T) { ReadBufferSize: 1024, WriteBufferSize: 1024, WaitForReady: true, - BalancerName: "configgrpc_balancer_test", + BalancerName: "round_robin", Authority: "pseudo-authority", Auth: &configauth.Authentication{AuthenticatorID: testAuthID}, }, From 9405cfe15d8ce38966179a8ad1568ceb7ed1033d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:51:56 -0700 Subject: [PATCH 129/168] fix(deps): update opentelemetry-go monorepo (#10520) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [go.opentelemetry.io/otel](https://togithub.com/open-telemetry/opentelemetry-go) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/otel/bridge/opencensus](https://togithub.com/open-telemetry/opentelemetry-go) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fbridge%2fopencensus/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fbridge%2fopencensus/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fbridge%2fopencensus/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fbridge%2fopencensus/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc](https://togithub.com/open-telemetry/opentelemetry-go) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlpmetric%2fotlpmetricgrpc/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlpmetric%2fotlpmetricgrpc/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlpmetric%2fotlpmetricgrpc/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlpmetric%2fotlpmetricgrpc/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp](https://togithub.com/open-telemetry/opentelemetry-go) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlpmetric%2fotlpmetrichttp/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlpmetric%2fotlpmetrichttp/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlpmetric%2fotlpmetrichttp/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlpmetric%2fotlpmetrichttp/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/otel/exporters/prometheus](https://togithub.com/open-telemetry/opentelemetry-go) | `v0.49.0` -> `v0.50.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fexporters%2fprometheus/v0.50.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fexporters%2fprometheus/v0.50.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fexporters%2fprometheus/v0.49.0/v0.50.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fexporters%2fprometheus/v0.49.0/v0.50.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/otel/exporters/stdout/stdoutmetric](https://togithub.com/open-telemetry/opentelemetry-go) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fexporters%2fstdout%2fstdoutmetric/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fexporters%2fstdout%2fstdoutmetric/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fexporters%2fstdout%2fstdoutmetric/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fexporters%2fstdout%2fstdoutmetric/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/otel/metric](https://togithub.com/open-telemetry/opentelemetry-go) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fmetric/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fmetric/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fmetric/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fmetric/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/otel/sdk](https://togithub.com/open-telemetry/opentelemetry-go) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fsdk/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fsdk/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fsdk/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fsdk/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/otel/sdk/metric](https://togithub.com/open-telemetry/opentelemetry-go) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fsdk%2fmetric/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fsdk%2fmetric/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fsdk%2fmetric/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fsdk%2fmetric/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/otel/trace](https://togithub.com/open-telemetry/opentelemetry-go) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2ftrace/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2ftrace/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2ftrace/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2ftrace/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
open-telemetry/opentelemetry-go (go.opentelemetry.io/otel) ### [`v1.28.0`](https://togithub.com/open-telemetry/opentelemetry-go/releases/tag/v1.28.0): Releases v1.28.0/v0.50.0/v0.4.0 [Compare Source](https://togithub.com/open-telemetry/opentelemetry-go/compare/v1.27.0...v1.28.0) #### Overview ##### Added - The `IsEmpty` method is added to the `Instrument` type in `go.opentelemetry.io/otel/sdk/metric`. This method is used to check if an `Instrument` instance is a zero-value. ([#​5431](https://togithub.com/open-telemetry/opentelemetry-go/issues/5431)) - Store and provide the emitted `context.Context` in `ScopeRecords` of `go.opentelemetry.io/otel/sdk/log/logtest`. ([#​5468](https://togithub.com/open-telemetry/opentelemetry-go/issues/5468)) - The `go.opentelemetry.io/otel/semconv/v1.26.0` package. The package contains semantic conventions from the `v1.26.0` version of the OpenTelemetry Semantic Conventions. ([#​5476](https://togithub.com/open-telemetry/opentelemetry-go/issues/5476)) - The `AssertRecordEqual` method to `go.opentelemetry.io/otel/log/logtest` to allow comparison of two log records in tests. ([#​5499](https://togithub.com/open-telemetry/opentelemetry-go/issues/5499)) - The `WithHeaders` option to `go.opentelemetry.io/otel/exporters/zipkin` to allow configuring custom http headers while exporting spans. ([#​5530](https://togithub.com/open-telemetry/opentelemetry-go/issues/5530)) ##### Changed - `Tracer.Start` in `go.opentelemetry.io/otel/trace/noop` no longer allocates a span for empty span context. ([#​5457](https://togithub.com/open-telemetry/opentelemetry-go/issues/5457)) - Upgrade `go.opentelemetry.io/otel/semconv/v1.25.0` to `go.opentelemetry.io/otel/semconv/v1.26.0` in `go.opentelemetry.io/otel/example/otel-collector`. ([#​5490](https://togithub.com/open-telemetry/opentelemetry-go/issues/5490)) - Upgrade `go.opentelemetry.io/otel/semconv/v1.25.0` to `go.opentelemetry.io/otel/semconv/v1.26.0` in `go.opentelemetry.io/otel/example/zipkin`. ([#​5490](https://togithub.com/open-telemetry/opentelemetry-go/issues/5490)) - Upgrade `go.opentelemetry.io/otel/semconv/v1.25.0` to `go.opentelemetry.io/otel/semconv/v1.26.0` in `go.opentelemetry.io/otel/exporters/zipkin`. ([#​5490](https://togithub.com/open-telemetry/opentelemetry-go/issues/5490)) - The exporter no longer exports the deprecated "otel.library.name" or "otel.library.version" attributes. - Upgrade `go.opentelemetry.io/otel/semconv/v1.25.0` to `go.opentelemetry.io/otel/semconv/v1.26.0` in `go.opentelemetry.io/otel/sdk/resource`. ([#​5490](https://togithub.com/open-telemetry/opentelemetry-go/issues/5490)) - Upgrade `go.opentelemetry.io/otel/semconv/v1.25.0` to `go.opentelemetry.io/otel/semconv/v1.26.0` in `go.opentelemetry.io/otel/sdk/trace`. ([#​5490](https://togithub.com/open-telemetry/opentelemetry-go/issues/5490)) - `SimpleProcessor.OnEmit` in `go.opentelemetry.io/otel/sdk/log` no longer allocates a slice which makes it possible to have a zero-allocation log processing using `SimpleProcessor`. ([#​5493](https://togithub.com/open-telemetry/opentelemetry-go/issues/5493)) - Use non-generic functions in the `Start` method of `"go.opentelemetry.io/otel/sdk/trace".Trace` to reduce memory allocation. ([#​5497](https://togithub.com/open-telemetry/opentelemetry-go/issues/5497)) - `service.instance.id` is populated for a `Resource` created with `"go.opentelemetry.io/otel/sdk/resource".Default` with a default value when `OTEL_GO_X_RESOURCE` is set. ([#​5520](https://togithub.com/open-telemetry/opentelemetry-go/issues/5520)) - Improve performance of metric instruments in `go.opentelemetry.io/otel/sdk/metric` by removing unnecessary calls to `time.Now`. ([#​5545](https://togithub.com/open-telemetry/opentelemetry-go/issues/5545)) ##### Fixed - Log a warning to the OpenTelemetry internal logger when a `Record` in `go.opentelemetry.io/otel/sdk/log` drops an attribute due to a limit being reached. ([#​5376](https://togithub.com/open-telemetry/opentelemetry-go/issues/5376)) - Identify the `Tracer` returned from the global `TracerProvider` in `go.opentelemetry.io/otel/global` with its schema URL. ([#​5426](https://togithub.com/open-telemetry/opentelemetry-go/issues/5426)) - Identify the `Meter` returned from the global `MeterProvider` in `go.opentelemetry.io/otel/global` with its schema URL. ([#​5426](https://togithub.com/open-telemetry/opentelemetry-go/issues/5426)) - Log a warning to the OpenTelemetry internal logger when a `Span` in `go.opentelemetry.io/otel/sdk/trace` drops an attribute, event, or link due to a limit being reached. ([#​5434](https://togithub.com/open-telemetry/opentelemetry-go/issues/5434)) - Document instrument name requirements in `go.opentelemetry.io/otel/metric`. ([#​5435](https://togithub.com/open-telemetry/opentelemetry-go/issues/5435)) - Prevent random number generation data-race for experimental rand exemplars in `go.opentelemetry.io/otel/sdk/metric`. ([#​5456](https://togithub.com/open-telemetry/opentelemetry-go/issues/5456)) - Fix counting number of dropped attributes of `Record` in `go.opentelemetry.io/otel/sdk/log`. ([#​5464](https://togithub.com/open-telemetry/opentelemetry-go/issues/5464)) - Fix panic in baggage creation when a member contains `0x80` char in key or value. ([#​5494](https://togithub.com/open-telemetry/opentelemetry-go/issues/5494)) - Correct comments for the priority of the `WithEndpoint` and `WithEndpointURL` options and their corresponding environment variables in `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc`. ([#​5508](https://togithub.com/open-telemetry/opentelemetry-go/issues/5508)) - Retry trace and span ID generation if it generated an invalid one in `go.opentelemetry.io/otel/sdk/trace`. ([#​5514](https://togithub.com/open-telemetry/opentelemetry-go/issues/5514)) - Fix stale timestamps reported by the last-value aggregation. ([#​5517](https://togithub.com/open-telemetry/opentelemetry-go/issues/5517)) - Indicate the `Exporter` in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp` must be created by the `New` method. ([#​5521](https://togithub.com/open-telemetry/opentelemetry-go/issues/5521)) - Improved performance in all `{Bool,Int64,Float64,String}SliceValue` functions of `go.opentelemetry.io/attributes` by reducing the number of allocations. ([#​5549](https://togithub.com/open-telemetry/opentelemetry-go/issues/5549)) #### What's Changed - Recheck log message in TestBatchProcessor by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5386](https://togithub.com/open-telemetry/opentelemetry-go/pull/5386) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`dc85e6b`](https://togithub.com/open-telemetry/opentelemetry-go/commit/dc85e6b) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5391](https://togithub.com/open-telemetry/opentelemetry-go/pull/5391) - fix(deps): update module go.opentelemetry.io/contrib/bridges/otelslog to v0.2.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5395](https://togithub.com/open-telemetry/opentelemetry-go/pull/5395) - fix(deps): update module github.com/go-logr/logr to v1.4.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5393](https://togithub.com/open-telemetry/opentelemetry-go/pull/5393) - fix(deps): update module go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp to v0.52.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5396](https://togithub.com/open-telemetry/opentelemetry-go/pull/5396) - chore(deps): update google.golang.org/genproto/googleapis/api digest to [`d264139`](https://togithub.com/open-telemetry/opentelemetry-go/commit/d264139) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5397](https://togithub.com/open-telemetry/opentelemetry-go/pull/5397) - fix(deps): update module go.opentelemetry.io/otel/sdk/log to v0.3.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5398](https://togithub.com/open-telemetry/opentelemetry-go/pull/5398) - chore(deps): update otel/opentelemetry-collector-contrib docker tag to v0.101.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5400](https://togithub.com/open-telemetry/opentelemetry-go/pull/5400) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`d264139`](https://togithub.com/open-telemetry/opentelemetry-go/commit/d264139) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5399](https://togithub.com/open-telemetry/opentelemetry-go/pull/5399) - \[chore] example/otel-collector: Fix README title by [@​pellared](https://togithub.com/pellared) in [https://github.com/open-telemetry/opentelemetry-go/pull/5404](https://togithub.com/open-telemetry/opentelemetry-go/pull/5404) - Pool `otlploghttp` transform maps by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5378](https://togithub.com/open-telemetry/opentelemetry-go/pull/5378) - fix(deps): update module golang.org/x/vuln to v1.1.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5405](https://togithub.com/open-telemetry/opentelemetry-go/pull/5405) - Fix test name in otlploghttp by [@​XSAM](https://togithub.com/XSAM) in [https://github.com/open-telemetry/opentelemetry-go/pull/5411](https://togithub.com/open-telemetry/opentelemetry-go/pull/5411) - sdk/log: Fix BenchmarkLoggerNewRecord to not drop attributes by [@​pellared](https://togithub.com/pellared) in [https://github.com/open-telemetry/opentelemetry-go/pull/5407](https://togithub.com/open-telemetry/opentelemetry-go/pull/5407) - chore(deps): update dependency codespell to v2.3.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5409](https://togithub.com/open-telemetry/opentelemetry-go/pull/5409) - fix(deps): update module github.com/golangci/golangci-lint to v1.59.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5419](https://togithub.com/open-telemetry/opentelemetry-go/pull/5419) - fix(deps): update golang.org/x/tools digest to [`7045d2e`](https://togithub.com/open-telemetry/opentelemetry-go/commit/7045d2e) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5406](https://togithub.com/open-telemetry/opentelemetry-go/pull/5406) - fix(deps): update golang.org/x/exp digest to [`4c93da0`](https://togithub.com/open-telemetry/opentelemetry-go/commit/4c93da0) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5415](https://togithub.com/open-telemetry/opentelemetry-go/pull/5415) - Log a warning when log Record attribute is dropped by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5376](https://togithub.com/open-telemetry/opentelemetry-go/pull/5376) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`a332354`](https://togithub.com/open-telemetry/opentelemetry-go/commit/a332354) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5424](https://togithub.com/open-telemetry/opentelemetry-go/pull/5424) - chore(deps): update google.golang.org/genproto/googleapis/api digest to [`a332354`](https://togithub.com/open-telemetry/opentelemetry-go/commit/a332354) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5423](https://togithub.com/open-telemetry/opentelemetry-go/pull/5423) - fix(deps): update golang.org/x/tools digest to [`f10a0f1`](https://togithub.com/open-telemetry/opentelemetry-go/commit/f10a0f1) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5430](https://togithub.com/open-telemetry/opentelemetry-go/pull/5430) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`5315273`](https://togithub.com/open-telemetry/opentelemetry-go/commit/5315273) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5428](https://togithub.com/open-telemetry/opentelemetry-go/pull/5428) - chore(deps): update google.golang.org/genproto/googleapis/api digest to [`5315273`](https://togithub.com/open-telemetry/opentelemetry-go/commit/5315273) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5427](https://togithub.com/open-telemetry/opentelemetry-go/pull/5427) - fix(deps): update golang.org/x/tools digest to [`e229045`](https://togithub.com/open-telemetry/opentelemetry-go/commit/e229045) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5432](https://togithub.com/open-telemetry/opentelemetry-go/pull/5432) - fix(deps): update golang.org/x/exp digest to [`23cca88`](https://togithub.com/open-telemetry/opentelemetry-go/commit/23cca88) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5429](https://togithub.com/open-telemetry/opentelemetry-go/pull/5429) - sdk/log: Fix TestBatchProcessor/DroppedLogs flaky test by [@​amanakin](https://togithub.com/amanakin) in [https://github.com/open-telemetry/opentelemetry-go/pull/5421](https://togithub.com/open-telemetry/opentelemetry-go/pull/5421) - Identify global `Tracer`s and `Meter`s with their schema URLs by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5426](https://togithub.com/open-telemetry/opentelemetry-go/pull/5426) - sdk/log: Fix TestBatchProcessor/ForceFlush/ErrorPartialFlush flaky test by [@​amanakin](https://togithub.com/amanakin) in [https://github.com/open-telemetry/opentelemetry-go/pull/5416](https://togithub.com/open-telemetry/opentelemetry-go/pull/5416) - Export the Instrument IsEmpty method by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5431](https://togithub.com/open-telemetry/opentelemetry-go/pull/5431) - fix(deps): update golang.org/x/tools digest to [`01018ba`](https://togithub.com/open-telemetry/opentelemetry-go/commit/01018ba) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5438](https://togithub.com/open-telemetry/opentelemetry-go/pull/5438) - \[chore] ensure codecov uses token by [@​codeboten](https://togithub.com/codeboten) in [https://github.com/open-telemetry/opentelemetry-go/pull/5440](https://togithub.com/open-telemetry/opentelemetry-go/pull/5440) - fix(deps): update golang.org/x/tools digest to [`8d54ca1`](https://togithub.com/open-telemetry/opentelemetry-go/commit/8d54ca1) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5441](https://togithub.com/open-telemetry/opentelemetry-go/pull/5441) - fix(deps): update golang.org/x/tools digest to [`2e977dd`](https://togithub.com/open-telemetry/opentelemetry-go/commit/2e977dd) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5442](https://togithub.com/open-telemetry/opentelemetry-go/pull/5442) - Remove zeroInstrumentKind by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5433](https://togithub.com/open-telemetry/opentelemetry-go/pull/5433) - Log warning when a trace attribute/event/link is discarded due to limits by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5434](https://togithub.com/open-telemetry/opentelemetry-go/pull/5434) - Remove opentelemetry-proto in .gitsubmodule by [@​YHM404](https://togithub.com/YHM404) in [https://github.com/open-telemetry/opentelemetry-go/pull/5267](https://togithub.com/open-telemetry/opentelemetry-go/pull/5267) - Document instrument name requirements by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5435](https://togithub.com/open-telemetry/opentelemetry-go/pull/5435) - fix(deps): update golang.org/x/exp digest to [`404ba88`](https://togithub.com/open-telemetry/opentelemetry-go/commit/404ba88) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5445](https://togithub.com/open-telemetry/opentelemetry-go/pull/5445) - Move `MonotonicEndTime` to only use by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5443](https://togithub.com/open-telemetry/opentelemetry-go/pull/5443) - fix(deps): update golang.org/x/tools digest to [`624dbd0`](https://togithub.com/open-telemetry/opentelemetry-go/commit/624dbd0) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5446](https://togithub.com/open-telemetry/opentelemetry-go/pull/5446) - fix(deps): update golang.org/x/exp digest to [`fd00a4e`](https://togithub.com/open-telemetry/opentelemetry-go/commit/fd00a4e) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5450](https://togithub.com/open-telemetry/opentelemetry-go/pull/5450) - fix(deps): update golang.org/x/tools digest to [`2f8e378`](https://togithub.com/open-telemetry/opentelemetry-go/commit/2f8e378) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5451](https://togithub.com/open-telemetry/opentelemetry-go/pull/5451) - fix(deps): update golang.org/x/tools digest to [`cc29c91`](https://togithub.com/open-telemetry/opentelemetry-go/commit/cc29c91) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5452](https://togithub.com/open-telemetry/opentelemetry-go/pull/5452) - chore(deps): update module github.com/prometheus/procfs to v0.15.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5453](https://togithub.com/open-telemetry/opentelemetry-go/pull/5453) - sdk/log: Add processor benchmarks by [@​pellared](https://togithub.com/pellared) in [https://github.com/open-telemetry/opentelemetry-go/pull/5448](https://togithub.com/open-telemetry/opentelemetry-go/pull/5448) - fix(deps): update module github.com/itchyny/gojq to v0.12.16 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5460](https://togithub.com/open-telemetry/opentelemetry-go/pull/5460) - Guard rng in exemplar rand computation by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5456](https://togithub.com/open-telemetry/opentelemetry-go/pull/5456) - chore(deps): update module github.com/prometheus/common to v0.54.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5472](https://togithub.com/open-telemetry/opentelemetry-go/pull/5472) - add `log` package to depguard linter by [@​amanakin](https://togithub.com/amanakin) in [https://github.com/open-telemetry/opentelemetry-go/pull/5463](https://togithub.com/open-telemetry/opentelemetry-go/pull/5463) - fix(deps): update golang.org/x/tools digest to [`58cc8a4`](https://togithub.com/open-telemetry/opentelemetry-go/commit/58cc8a4) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5473](https://togithub.com/open-telemetry/opentelemetry-go/pull/5473) - fix(deps): update golang.org/x/tools digest to [`4478db0`](https://togithub.com/open-telemetry/opentelemetry-go/commit/4478db0) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5474](https://togithub.com/open-telemetry/opentelemetry-go/pull/5474) - sdk/log: Fix counting number of dropped attributes of log `Record` by [@​amanakin](https://togithub.com/amanakin) in [https://github.com/open-telemetry/opentelemetry-go/pull/5464](https://togithub.com/open-telemetry/opentelemetry-go/pull/5464) - fix(deps): update golang.org/x/tools digest to [`2088083`](https://togithub.com/open-telemetry/opentelemetry-go/commit/2088083) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5477](https://togithub.com/open-telemetry/opentelemetry-go/pull/5477) - trace: Span in noop.Start is no longer allocated by [@​tttoad](https://togithub.com/tttoad) in [https://github.com/open-telemetry/opentelemetry-go/pull/5457](https://togithub.com/open-telemetry/opentelemetry-go/pull/5457) - chore(deps): update module golang.org/x/sys to v0.21.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5481](https://togithub.com/open-telemetry/opentelemetry-go/pull/5481) - fix(deps): update module golang.org/x/tools to v0.22.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5485](https://togithub.com/open-telemetry/opentelemetry-go/pull/5485) - Bump min Go version used in CI by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5489](https://togithub.com/open-telemetry/opentelemetry-go/pull/5489) - chore(deps): update module golang.org/x/text to v0.16.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5482](https://togithub.com/open-telemetry/opentelemetry-go/pull/5482) - Add `semconv/v1.26.0`, removes deprecated semconvs by [@​MadVikingGod](https://togithub.com/MadVikingGod) in [https://github.com/open-telemetry/opentelemetry-go/pull/5476](https://togithub.com/open-telemetry/opentelemetry-go/pull/5476) - Add the sdk/internal/x package by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5444](https://togithub.com/open-telemetry/opentelemetry-go/pull/5444) - chore(deps): update otel/opentelemetry-collector-contrib docker tag to v0.102.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5479](https://togithub.com/open-telemetry/opentelemetry-go/pull/5479) - chore(deps): update module golang.org/x/net to v0.26.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5484](https://togithub.com/open-telemetry/opentelemetry-go/pull/5484) - chore(deps): update google.golang.org/genproto/googleapis/api digest to [`ef581f9`](https://togithub.com/open-telemetry/opentelemetry-go/commit/ef581f9) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5486](https://togithub.com/open-telemetry/opentelemetry-go/pull/5486) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`ef581f9`](https://togithub.com/open-telemetry/opentelemetry-go/commit/ef581f9) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5487](https://togithub.com/open-telemetry/opentelemetry-go/pull/5487) - fix(deps): update golang.org/x/exp digest to [`fc45aab`](https://togithub.com/open-telemetry/opentelemetry-go/commit/fc45aab) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5488](https://togithub.com/open-telemetry/opentelemetry-go/pull/5488) - log/logtest: provide record with their context by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5468](https://togithub.com/open-telemetry/opentelemetry-go/pull/5468) - Upgrade semconv use to v1.26.0 by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5490](https://togithub.com/open-telemetry/opentelemetry-go/pull/5490) - sdk/log: Remove slice allocation from SimpleProcessor.OnEmit by [@​pellared](https://togithub.com/pellared) in [https://github.com/open-telemetry/opentelemetry-go/pull/5493](https://togithub.com/open-telemetry/opentelemetry-go/pull/5493) - fix(deps): update module golang.org/x/vuln to v1.1.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5496](https://togithub.com/open-telemetry/opentelemetry-go/pull/5496) - fix(deps): update module github.com/golangci/golangci-lint to v1.59.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5498](https://togithub.com/open-telemetry/opentelemetry-go/pull/5498) - chore(deps): update google.golang.org/genproto/googleapis/api digest to [`a8a6208`](https://togithub.com/open-telemetry/opentelemetry-go/commit/a8a6208) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5501](https://togithub.com/open-telemetry/opentelemetry-go/pull/5501) - Introduce logtest.AssertRecordEqual by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5499](https://togithub.com/open-telemetry/opentelemetry-go/pull/5499) - Add implementation of otlploggrpc configuration by [@​XSAM](https://togithub.com/XSAM) in [https://github.com/open-telemetry/opentelemetry-go/pull/5383](https://togithub.com/open-telemetry/opentelemetry-go/pull/5383) - fix(deps): update golang.org/x/exp digest to [`7f521ea`](https://togithub.com/open-telemetry/opentelemetry-go/commit/7f521ea) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5512](https://togithub.com/open-telemetry/opentelemetry-go/pull/5512) - Move evantorrie to emeritus status by [@​evantorrie](https://togithub.com/evantorrie) in [https://github.com/open-telemetry/opentelemetry-go/pull/5507](https://togithub.com/open-telemetry/opentelemetry-go/pull/5507) - Add missing word in WithView() doc string by [@​juliusv](https://togithub.com/juliusv) in [https://github.com/open-telemetry/opentelemetry-go/pull/5506](https://togithub.com/open-telemetry/opentelemetry-go/pull/5506) - chore(deps): update codecov/codecov-action action to v4.5.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5509](https://togithub.com/open-telemetry/opentelemetry-go/pull/5509) - chore(deps): update otel/opentelemetry-collector-contrib docker tag to v0.102.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5491](https://togithub.com/open-telemetry/opentelemetry-go/pull/5491) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`a8a6208`](https://togithub.com/open-telemetry/opentelemetry-go/commit/a8a6208) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5502](https://togithub.com/open-telemetry/opentelemetry-go/pull/5502) - fix(deps): update module google.golang.org/protobuf to v1.34.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5503](https://togithub.com/open-telemetry/opentelemetry-go/pull/5503) - trace: Use non-generic to replace newEvictedQueue in trace.start to reduce memory usage. by [@​tttoad](https://togithub.com/tttoad) in [https://github.com/open-telemetry/opentelemetry-go/pull/5497](https://togithub.com/open-telemetry/opentelemetry-go/pull/5497) - chore(deps): update jaegertracing/all-in-one docker tag to v1.58 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5504](https://togithub.com/open-telemetry/opentelemetry-go/pull/5504) - fix(deps): update module go.opentelemetry.io/proto/otlp to v1.3.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5505](https://togithub.com/open-telemetry/opentelemetry-go/pull/5505) - fix(baggage): validate chars panic with 0x80 by [@​fabiobozzo](https://togithub.com/fabiobozzo) in [https://github.com/open-telemetry/opentelemetry-go/pull/5494](https://togithub.com/open-telemetry/opentelemetry-go/pull/5494) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`68d350f`](https://togithub.com/open-telemetry/opentelemetry-go/commit/68d350f) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5516](https://togithub.com/open-telemetry/opentelemetry-go/pull/5516) - chore(deps): update google.golang.org/genproto/googleapis/api digest to [`68d350f`](https://togithub.com/open-telemetry/opentelemetry-go/commit/68d350f) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5515](https://togithub.com/open-telemetry/opentelemetry-go/pull/5515) - Correct the comment for the priority of options and environments on otlptracegrpc by [@​XSAM](https://togithub.com/XSAM) in [https://github.com/open-telemetry/opentelemetry-go/pull/5508](https://togithub.com/open-telemetry/opentelemetry-go/pull/5508) - Fix IDGenerator may generate zero TraceId / SpanId by [@​Charlie-lizhihan](https://togithub.com/Charlie-lizhihan) in [https://github.com/open-telemetry/opentelemetry-go/pull/5514](https://togithub.com/open-telemetry/opentelemetry-go/pull/5514) - Fix timestamp handling for the lastvalue aggregation by [@​dashpole](https://togithub.com/dashpole) in [https://github.com/open-telemetry/opentelemetry-go/pull/5517](https://togithub.com/open-telemetry/opentelemetry-go/pull/5517) - Add tenv linter by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5524](https://togithub.com/open-telemetry/opentelemetry-go/pull/5524) - chore(deps): update otel/opentelemetry-collector-contrib docker tag to v0.103.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5526](https://togithub.com/open-telemetry/opentelemetry-go/pull/5526) - chore(deps): update prom/prometheus docker tag to v2.53.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5525](https://togithub.com/open-telemetry/opentelemetry-go/pull/5525) - Do not fail CI on codecov create report by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5532](https://togithub.com/open-telemetry/opentelemetry-go/pull/5532) - Add unconvert linter by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5529](https://togithub.com/open-telemetry/opentelemetry-go/pull/5529) - Add unparam linter by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5531](https://togithub.com/open-telemetry/opentelemetry-go/pull/5531) - Add example for synchronous gauge by [@​bagmeg](https://togithub.com/bagmeg) in [https://github.com/open-telemetry/opentelemetry-go/pull/5492](https://togithub.com/open-telemetry/opentelemetry-go/pull/5492) - Add `newClient` method for otlploggrpc gRPC client by [@​XSAM](https://togithub.com/XSAM) in [https://github.com/open-telemetry/opentelemetry-go/pull/5523](https://togithub.com/open-telemetry/opentelemetry-go/pull/5523) - Verify versions.yaml is up to date in CI by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5533](https://togithub.com/open-telemetry/opentelemetry-go/pull/5533) - Populate `service.instance.id` with a default value when `OTEL_GO_X_RESOURCE` is set by [@​pyohannes](https://togithub.com/pyohannes) in [https://github.com/open-telemetry/opentelemetry-go/pull/5520](https://togithub.com/open-telemetry/opentelemetry-go/pull/5520) - chore(deps): update google.golang.org/genproto/googleapis/api digest to [`dc46fd2`](https://togithub.com/open-telemetry/opentelemetry-go/commit/dc46fd2) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5538](https://togithub.com/open-telemetry/opentelemetry-go/pull/5538) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`dc46fd2`](https://togithub.com/open-telemetry/opentelemetry-go/commit/dc46fd2) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5539](https://togithub.com/open-telemetry/opentelemetry-go/pull/5539) - chore(deps): update otel/opentelemetry-collector-contrib docker tag to v0.103.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5540](https://togithub.com/open-telemetry/opentelemetry-go/pull/5540) - Decouple codecov upload from coverage testing by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5534](https://togithub.com/open-telemetry/opentelemetry-go/pull/5534) - Add errorlint linter by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5535](https://togithub.com/open-telemetry/opentelemetry-go/pull/5535) - Add WithHeaders option for Zipkin exporter by [@​srijan-27](https://togithub.com/srijan-27) in [https://github.com/open-telemetry/opentelemetry-go/pull/5530](https://togithub.com/open-telemetry/opentelemetry-go/pull/5530) - chore(deps): update module github.com/prometheus/common to v0.55.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5552](https://togithub.com/open-telemetry/opentelemetry-go/pull/5552) - Indicate the otlploghttp exporter must be created by the New method by [@​XSAM](https://togithub.com/XSAM) in [https://github.com/open-telemetry/opentelemetry-go/pull/5521](https://togithub.com/open-telemetry/opentelemetry-go/pull/5521) - sdk/log: Add altering Processor example by [@​pellared](https://togithub.com/pellared) in [https://github.com/open-telemetry/opentelemetry-go/pull/5550](https://togithub.com/open-telemetry/opentelemetry-go/pull/5550) - Split the set and add attributes benchmarks by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5546](https://togithub.com/open-telemetry/opentelemetry-go/pull/5546) - Add walk attributes benchmark by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5547](https://togithub.com/open-telemetry/opentelemetry-go/pull/5547) - Add benchmark retrieving a new logger by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5548](https://togithub.com/open-telemetry/opentelemetry-go/pull/5548) - chore(deps): update jaegertracing/all-in-one docker tag to v1.54 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5555](https://togithub.com/open-telemetry/opentelemetry-go/pull/5555) - chore(deps): update jaegertracing/all-in-one docker tag to v1.58 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5556](https://togithub.com/open-telemetry/opentelemetry-go/pull/5556) - Reduces allocation in attributes by [@​Succo](https://togithub.com/Succo) in [https://github.com/open-telemetry/opentelemetry-go/pull/5549](https://togithub.com/open-telemetry/opentelemetry-go/pull/5549) - Generate `internal/transform` in `otlploggrpc` by [@​XSAM](https://togithub.com/XSAM) in [https://github.com/open-telemetry/opentelemetry-go/pull/5553](https://togithub.com/open-telemetry/opentelemetry-go/pull/5553) - Split the span start/end benchmarks and test start with links and attributes by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go/pull/5554](https://togithub.com/open-telemetry/opentelemetry-go/pull/5554) - sdk/log: Fix ExampleProcessor_redact to clone the record by [@​pellared](https://togithub.com/pellared) in [https://github.com/open-telemetry/opentelemetry-go/pull/5559](https://togithub.com/open-telemetry/opentelemetry-go/pull/5559) - sdk/log: Add filtering Processor example by [@​pellared](https://togithub.com/pellared) in [https://github.com/open-telemetry/opentelemetry-go/pull/5543](https://togithub.com/open-telemetry/opentelemetry-go/pull/5543) - chore(deps): update google.golang.org/genproto/googleapis/api digest to [`f6361c8`](https://togithub.com/open-telemetry/opentelemetry-go/commit/f6361c8) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5563](https://togithub.com/open-telemetry/opentelemetry-go/pull/5563) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`f6361c8`](https://togithub.com/open-telemetry/opentelemetry-go/commit/f6361c8) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5564](https://togithub.com/open-telemetry/opentelemetry-go/pull/5564) - Move time.Now call into exemplar reservoir to improve performance by [@​dashpole](https://togithub.com/dashpole) in [https://github.com/open-telemetry/opentelemetry-go/pull/5545](https://togithub.com/open-telemetry/opentelemetry-go/pull/5545) - chore(deps): update otel/opentelemetry-collector-contrib docker tag to v0.104.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go/pull/5565](https://togithub.com/open-telemetry/opentelemetry-go/pull/5565) - Add [@​XSAM](https://togithub.com/XSAM) and [@​dmathieu](https://togithub.com/dmathieu) as repository maintainers by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5558](https://togithub.com/open-telemetry/opentelemetry-go/pull/5558) - Releases v1.28.0/v0.50.0/v0.4.0 by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go/pull/5569](https://togithub.com/open-telemetry/opentelemetry-go/pull/5569) #### New Contributors - [@​YHM404](https://togithub.com/YHM404) made their first contribution in [https://github.com/open-telemetry/opentelemetry-go/pull/5267](https://togithub.com/open-telemetry/opentelemetry-go/pull/5267) - [@​juliusv](https://togithub.com/juliusv) made their first contribution in [https://github.com/open-telemetry/opentelemetry-go/pull/5506](https://togithub.com/open-telemetry/opentelemetry-go/pull/5506) - [@​fabiobozzo](https://togithub.com/fabiobozzo) made their first contribution in [https://github.com/open-telemetry/opentelemetry-go/pull/5494](https://togithub.com/open-telemetry/opentelemetry-go/pull/5494) - [@​Charlie-lizhihan](https://togithub.com/Charlie-lizhihan) made their first contribution in [https://github.com/open-telemetry/opentelemetry-go/pull/5514](https://togithub.com/open-telemetry/opentelemetry-go/pull/5514) - [@​bagmeg](https://togithub.com/bagmeg) made their first contribution in [https://github.com/open-telemetry/opentelemetry-go/pull/5492](https://togithub.com/open-telemetry/opentelemetry-go/pull/5492) - [@​pyohannes](https://togithub.com/pyohannes) made their first contribution in [https://github.com/open-telemetry/opentelemetry-go/pull/5520](https://togithub.com/open-telemetry/opentelemetry-go/pull/5520) - [@​srijan-27](https://togithub.com/srijan-27) made their first contribution in [https://github.com/open-telemetry/opentelemetry-go/pull/5530](https://togithub.com/open-telemetry/opentelemetry-go/pull/5530) - [@​Succo](https://togithub.com/Succo) made their first contribution in [https://github.com/open-telemetry/opentelemetry-go/pull/5549](https://togithub.com/open-telemetry/opentelemetry-go/pull/5549) **Full Changelog**: https://github.com/open-telemetry/opentelemetry-go/compare/v1.27.0...v1.28.0
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/mdatagen/go.mod | 14 +++---- cmd/mdatagen/go.sum | 28 ++++++------- cmd/otelcorecol/go.mod | 28 ++++++------- cmd/otelcorecol/go.sum | 56 ++++++++++++------------- component/go.mod | 15 +++---- component/go.sum | 30 ++++++------- config/configauth/go.mod | 6 +-- config/configauth/go.sum | 30 ++++++------- config/configgrpc/go.mod | 15 +++---- config/configgrpc/go.sum | 30 ++++++------- config/confighttp/go.mod | 15 +++---- config/confighttp/go.sum | 30 ++++++------- connector/forwardconnector/go.mod | 14 +++---- connector/forwardconnector/go.sum | 28 ++++++------- connector/go.mod | 14 +++---- connector/go.sum | 28 ++++++------- exporter/debugexporter/go.mod | 14 +++---- exporter/debugexporter/go.sum | 28 ++++++------- exporter/go.mod | 14 +++---- exporter/go.sum | 28 ++++++------- exporter/loggingexporter/go.mod | 14 +++---- exporter/loggingexporter/go.sum | 28 ++++++------- exporter/nopexporter/go.mod | 14 +++---- exporter/nopexporter/go.sum | 28 ++++++------- exporter/otlpexporter/go.mod | 14 +++---- exporter/otlpexporter/go.sum | 28 ++++++------- exporter/otlphttpexporter/go.mod | 14 +++---- exporter/otlphttpexporter/go.sum | 28 ++++++------- extension/auth/go.mod | 15 +++---- extension/auth/go.sum | 30 ++++++------- extension/ballastextension/go.mod | 14 +++---- extension/ballastextension/go.sum | 28 ++++++------- extension/go.mod | 14 +++---- extension/go.sum | 28 ++++++------- extension/memorylimiterextension/go.mod | 14 +++---- extension/memorylimiterextension/go.sum | 28 ++++++------- extension/zpagesextension/go.mod | 14 +++---- extension/zpagesextension/go.sum | 28 ++++++------- go.mod | 15 +++---- go.sum | 30 ++++++------- internal/e2e/go.mod | 14 +++---- internal/e2e/go.sum | 28 ++++++------- otelcol/go.mod | 28 ++++++------- otelcol/go.sum | 56 ++++++++++++------------- otelcol/otelcoltest/go.mod | 28 ++++++------- otelcol/otelcoltest/go.sum | 56 ++++++++++++------------- processor/batchprocessor/go.mod | 14 +++---- processor/batchprocessor/go.sum | 28 ++++++------- processor/go.mod | 14 +++---- processor/go.sum | 28 ++++++------- processor/memorylimiterprocessor/go.mod | 14 +++---- processor/memorylimiterprocessor/go.sum | 28 ++++++------- receiver/go.mod | 14 +++---- receiver/go.sum | 28 ++++++------- receiver/nopreceiver/go.mod | 14 +++---- receiver/nopreceiver/go.sum | 28 ++++++------- receiver/otlpreceiver/go.mod | 14 +++---- receiver/otlpreceiver/go.sum | 28 ++++++------- service/go.mod | 28 ++++++------- service/go.sum | 56 ++++++++++++------------- 60 files changed, 727 insertions(+), 710 deletions(-) diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 6d4bf723a0c..5163d7f0ef8 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -14,10 +14,10 @@ require ( go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/collector/receiver v0.104.0 go.opentelemetry.io/collector/semconv v0.104.0 - go.opentelemetry.io/otel v1.27.0 - go.opentelemetry.io/otel/metric v1.27.0 - go.opentelemetry.io/otel/sdk/metric v1.27.0 - go.opentelemetry.io/otel/trace v1.27.0 + go.opentelemetry.io/otel v1.28.0 + go.opentelemetry.io/otel/metric v1.28.0 + go.opentelemetry.io/otel/sdk/metric v1.28.0 + go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 golang.org/x/text v0.16.0 @@ -27,7 +27,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -48,8 +48,8 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 245e3c22809..dba5d90abd5 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -64,18 +64,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 9d251c6bbf6..3a0759384cc 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -43,7 +43,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect @@ -102,29 +102,29 @@ require ( go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index baabec8cdec..5149646ec1d 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -22,8 +22,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -155,36 +155,36 @@ go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/bridge/opencensus v1.27.0 h1:ao9aGGHd+G4YfjBpGs6vbkvt5hoC67STlJA9fCnOAcs= -go.opentelemetry.io/otel/bridge/opencensus v1.27.0/go.mod h1:uRvWtAAXzyVOST0WMPX5JHGBaAvBws+2F8PcC5gMnTk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= +go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -252,10 +252,10 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/component/go.mod b/component/go.mod index 54edd040c52..e03508325e7 100644 --- a/component/go.mod +++ b/component/go.mod @@ -9,12 +9,12 @@ require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/config/configtelemetry v0.104.0 go.opentelemetry.io/collector/pdata v1.11.0 - go.opentelemetry.io/otel v1.27.0 - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 - go.opentelemetry.io/otel/metric v1.27.0 - go.opentelemetry.io/otel/sdk v1.27.0 - go.opentelemetry.io/otel/sdk/metric v1.27.0 - go.opentelemetry.io/otel/trace v1.27.0 + go.opentelemetry.io/otel v1.28.0 + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 + go.opentelemetry.io/otel/metric v1.28.0 + go.opentelemetry.io/otel/sdk v1.28.0 + go.opentelemetry.io/otel/sdk/metric v1.28.0 + go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -24,9 +24,10 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect diff --git a/component/go.sum b/component/go.sum index 35496fcd7de..84c77c2abda 100644 --- a/component/go.sum +++ b/component/go.sum @@ -5,14 +5,16 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -37,18 +39,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/config/configauth/go.mod b/config/configauth/go.mod index 97146524dd7..83af8506079 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -25,9 +25,9 @@ require ( go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/config/configauth/go.sum b/config/configauth/go.sum index 88ab5d48ad7..364d60edbab 100644 --- a/config/configauth/go.sum +++ b/config/configauth/go.sum @@ -4,8 +4,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 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/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -14,6 +14,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -50,18 +52,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/config/configgrpc/go.mod b/config/configgrpc/go.mod index 5946d36fd47..ddb210db9d8 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -19,7 +19,7 @@ require ( go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 - go.opentelemetry.io/otel v1.27.0 + go.opentelemetry.io/otel v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.65.0 @@ -30,11 +30,12 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.8 // indirect @@ -54,11 +55,11 @@ require ( go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index 4adedfe26ae..8c41da5ed5e 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -21,6 +21,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW 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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -72,18 +74,18 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/config/confighttp/go.mod b/config/confighttp/go.mod index 2d9ad26a278..541aa6f3e9b 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -18,7 +18,7 @@ require ( go.opentelemetry.io/collector/extension/auth v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 - go.opentelemetry.io/otel v1.27.0 + go.opentelemetry.io/otel v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 golang.org/x/net v0.26.0 @@ -30,10 +30,11 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -49,11 +50,11 @@ require ( go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index d58971df3d1..60238a7e37b 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -9,8 +9,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -21,6 +21,8 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -69,18 +71,18 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index cd0371971c5..e68d1e8d1c6 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -16,7 +16,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -39,12 +39,12 @@ require ( go.opentelemetry.io/collector v0.104.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index 245e3c22809..dba5d90abd5 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -64,18 +64,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/connector/go.mod b/connector/go.mod index fec0181be26..66f2e02cae7 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -19,7 +19,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -33,12 +33,12 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect diff --git a/connector/go.sum b/connector/go.sum index a10535cdd1b..591d3eb7928 100644 --- a/connector/go.sum +++ b/connector/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -50,18 +50,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 7d7c023caac..c0660f70298 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -20,7 +20,7 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -46,12 +46,12 @@ require ( go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index ca473c203d8..3a2bf1f7be2 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -66,18 +66,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/exporter/go.mod b/exporter/go.mod index d879ec7cc4d..8f9ef86c134 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -15,11 +15,11 @@ require ( go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.opentelemetry.io/collector/receiver v0.104.0 - go.opentelemetry.io/otel v1.27.0 - go.opentelemetry.io/otel/metric v1.27.0 - go.opentelemetry.io/otel/sdk v1.27.0 - go.opentelemetry.io/otel/sdk/metric v1.27.0 - go.opentelemetry.io/otel/trace v1.27.0 + go.opentelemetry.io/otel v1.28.0 + go.opentelemetry.io/otel/metric v1.28.0 + go.opentelemetry.io/otel/sdk v1.28.0 + go.opentelemetry.io/otel/sdk/metric v1.28.0 + go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -31,7 +31,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -53,7 +53,7 @@ require ( go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect diff --git a/exporter/go.sum b/exporter/go.sum index ca473c203d8..3a2bf1f7be2 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -66,18 +66,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index bd2d18075d7..ecce5838d1d 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -19,7 +19,7 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -45,12 +45,12 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index ca473c203d8..3a2bf1f7be2 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -66,18 +66,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index 63916169bf0..aa3a32d1e2a 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -39,12 +39,12 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index ca473c203d8..3a2bf1f7be2 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -66,18 +66,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 04e3660757d..a001cd71559 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -30,7 +30,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -64,19 +64,19 @@ require ( go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index ba5f2e58e36..386bc449f92 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -10,8 +10,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -80,8 +80,8 @@ go.opentelemetry.io/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6O go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= @@ -92,20 +92,20 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffA go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index bc8fc406c74..155e8c121f5 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -29,7 +29,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -62,19 +62,19 @@ require ( go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index d2bfed0ad39..f915d3df73a 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -12,8 +12,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -82,8 +82,8 @@ go.opentelemetry.io/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6O go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= @@ -94,20 +94,20 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffA go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 1672e9c9926..2af234e1c6c 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -14,10 +14,11 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -34,12 +35,12 @@ require ( go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/extension/auth/go.sum b/extension/auth/go.sum index 08c66e3a14b..62749f090bb 100644 --- a/extension/auth/go.sum +++ b/extension/auth/go.sum @@ -5,8 +5,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -15,6 +15,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -51,18 +53,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index c7ecdae789d..458fe3c430d 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -17,7 +17,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect @@ -44,12 +44,12 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index 79e3223f0bd..82521020878 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -5,8 +5,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -68,18 +68,18 @@ 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/extension/go.mod b/extension/go.mod index 2006fbbacd5..efd236fcd58 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -14,7 +14,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -33,12 +33,12 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/extension/go.sum b/extension/go.sum index d5afd904b86..62749f090bb 100644 --- a/extension/go.sum +++ b/extension/go.sum @@ -5,8 +5,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -53,18 +53,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index a1ffadf4023..b64ce6a1b28 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -16,7 +16,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect @@ -43,12 +43,12 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index 79e3223f0bd..82521020878 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -5,8 +5,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -68,18 +68,18 @@ 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index b1b2bacf51d..56bb087128c 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -11,8 +11,8 @@ require ( go.opentelemetry.io/collector/confmap v0.104.0 go.opentelemetry.io/collector/extension v0.104.0 go.opentelemetry.io/contrib/zpages v0.52.0 - go.opentelemetry.io/otel/sdk v1.27.0 - go.opentelemetry.io/otel/trace v1.27.0 + go.opentelemetry.io/otel/sdk v1.28.0 + go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -24,7 +24,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -55,17 +55,17 @@ require ( go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index 4f0699f3b9a..91e53c9bc39 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -11,8 +11,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -79,8 +79,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= @@ -91,20 +91,20 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffA go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/go.mod b/go.mod index d9055d27488..a369d04150b 100644 --- a/go.mod +++ b/go.mod @@ -31,11 +31,12 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -59,19 +60,19 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/go.sum b/go.sum index 814eca57727..ac14452d95f 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= @@ -83,8 +85,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= @@ -95,20 +97,20 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffA go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index b07915efad4..8d140d5b953 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -30,7 +30,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -67,19 +67,19 @@ require ( go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 94dec360f54..c16df16848f 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -12,8 +12,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -86,8 +86,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= @@ -98,20 +98,20 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffA go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/otelcol/go.mod b/otelcol/go.mod index fd88e6dca1d..abd040ae889 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -30,7 +30,7 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect @@ -70,26 +70,26 @@ require ( go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/protobuf v1.34.2 // indirect ) diff --git a/otelcol/go.sum b/otelcol/go.sum index 5af48f58373..2cc9af2e3ed 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -22,8 +22,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -151,36 +151,36 @@ go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/bridge/opencensus v1.27.0 h1:ao9aGGHd+G4YfjBpGs6vbkvt5hoC67STlJA9fCnOAcs= -go.opentelemetry.io/otel/bridge/opencensus v1.27.0/go.mod h1:uRvWtAAXzyVOST0WMPX5JHGBaAvBws+2F8PcC5gMnTk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= +go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -248,10 +248,10 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index dec9d0cdc04..ddd500a9a7a 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -26,7 +26,7 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect @@ -70,21 +70,21 @@ require ( go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect @@ -92,8 +92,8 @@ require ( golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum index 5af48f58373..2cc9af2e3ed 100644 --- a/otelcol/otelcoltest/go.sum +++ b/otelcol/otelcoltest/go.sum @@ -22,8 +22,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -151,36 +151,36 @@ go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/bridge/opencensus v1.27.0 h1:ao9aGGHd+G4YfjBpGs6vbkvt5hoC67STlJA9fCnOAcs= -go.opentelemetry.io/otel/bridge/opencensus v1.27.0/go.mod h1:uRvWtAAXzyVOST0WMPX5JHGBaAvBws+2F8PcC5gMnTk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= +go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -248,10 +248,10 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 2f541f7f788..b14615db00b 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -12,10 +12,10 @@ require ( go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.opentelemetry.io/collector/processor v0.104.0 - go.opentelemetry.io/otel v1.27.0 - go.opentelemetry.io/otel/metric v1.27.0 - go.opentelemetry.io/otel/sdk/metric v1.27.0 - go.opentelemetry.io/otel/trace v1.27.0 + go.opentelemetry.io/otel v1.28.0 + go.opentelemetry.io/otel/metric v1.28.0 + go.opentelemetry.io/otel/sdk/metric v1.28.0 + go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -24,7 +24,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -46,8 +46,8 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index 245e3c22809..dba5d90abd5 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -64,18 +64,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/processor/go.mod b/processor/go.mod index a5c683e9c02..fe9cb2102d1 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -11,10 +11,10 @@ require ( go.opentelemetry.io/collector/consumer v0.104.0 go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/collector/pdata/testdata v0.104.0 - go.opentelemetry.io/otel v1.27.0 - go.opentelemetry.io/otel/metric v1.27.0 - go.opentelemetry.io/otel/sdk/metric v1.27.0 - go.opentelemetry.io/otel/trace v1.27.0 + go.opentelemetry.io/otel v1.28.0 + go.opentelemetry.io/otel/metric v1.28.0 + go.opentelemetry.io/otel/sdk/metric v1.28.0 + go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -23,7 +23,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -36,8 +36,8 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/processor/go.sum b/processor/go.sum index a10535cdd1b..591d3eb7928 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -50,18 +50,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 6b8dbad8b08..920acd96311 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -17,7 +17,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect @@ -48,12 +48,12 @@ require ( go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index d3c2e75ed45..a748f76a7fc 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -79,18 +79,18 @@ 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/receiver/go.mod b/receiver/go.mod index 70c7fb8737f..2ca3adf9a84 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -10,11 +10,11 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 go.opentelemetry.io/collector/consumer v0.104.0 go.opentelemetry.io/collector/pdata v1.11.0 - go.opentelemetry.io/otel v1.27.0 - go.opentelemetry.io/otel/metric v1.27.0 - go.opentelemetry.io/otel/sdk v1.27.0 - go.opentelemetry.io/otel/sdk/metric v1.27.0 - go.opentelemetry.io/otel/trace v1.27.0 + go.opentelemetry.io/otel v1.28.0 + go.opentelemetry.io/otel/metric v1.28.0 + go.opentelemetry.io/otel/sdk v1.28.0 + go.opentelemetry.io/otel/sdk/metric v1.28.0 + go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -24,7 +24,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -36,7 +36,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect diff --git a/receiver/go.sum b/receiver/go.sum index a10535cdd1b..591d3eb7928 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -50,18 +50,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index b368ce3039a..03308ae22bd 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -15,7 +15,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -38,12 +38,12 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/receiver/nopreceiver/go.sum b/receiver/nopreceiver/go.sum index 245e3c22809..dba5d90abd5 100644 --- a/receiver/nopreceiver/go.sum +++ b/receiver/nopreceiver/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -64,18 +64,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= 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/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 4c5588e4e6b..cc4accf4312 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -31,7 +31,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -66,19 +66,19 @@ require ( go.opentelemetry.io/contrib/config v0.7.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect - go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.27.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect - go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 94dec360f54..c16df16848f 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -12,8 +12,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= @@ -86,8 +86,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= @@ -98,20 +98,20 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffA go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/service/go.mod b/service/go.mod index 49980150161..71b52d7cc1d 100644 --- a/service/go.mod +++ b/service/go.mod @@ -28,16 +28,16 @@ require ( go.opentelemetry.io/collector/semconv v0.104.0 go.opentelemetry.io/contrib/config v0.7.0 go.opentelemetry.io/contrib/propagators/b3 v1.27.0 - go.opentelemetry.io/otel v1.27.0 - go.opentelemetry.io/otel/bridge/opencensus v1.27.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 - go.opentelemetry.io/otel/exporters/prometheus v0.49.0 - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 - go.opentelemetry.io/otel/metric v1.27.0 - go.opentelemetry.io/otel/sdk v1.27.0 - go.opentelemetry.io/otel/sdk/metric v1.27.0 - go.opentelemetry.io/otel/trace v1.27.0 + go.opentelemetry.io/otel v1.28.0 + go.opentelemetry.io/otel/bridge/opencensus v1.28.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 + go.opentelemetry.io/otel/metric v1.28.0 + go.opentelemetry.io/otel/sdk v1.28.0 + go.opentelemetry.io/otel/sdk/metric v1.28.0 + go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -51,7 +51,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect @@ -92,12 +92,12 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/service/go.sum b/service/go.sum index 1b59c2e81e9..0a665d9c098 100644 --- a/service/go.sum +++ b/service/go.sum @@ -21,8 +21,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -143,36 +143,36 @@ go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= -go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= -go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= -go.opentelemetry.io/otel/bridge/opencensus v1.27.0 h1:ao9aGGHd+G4YfjBpGs6vbkvt5hoC67STlJA9fCnOAcs= -go.opentelemetry.io/otel/bridge/opencensus v1.27.0/go.mod h1:uRvWtAAXzyVOST0WMPX5JHGBaAvBws+2F8PcC5gMnTk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= +go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0 h1:Er5I1g/YhfYv9Affk9nJLfH/+qCCVVg1f2R9AbJfqDQ= -go.opentelemetry.io/otel/exporters/prometheus v0.49.0/go.mod h1:KfQ1wpjf3zsHjzP149P4LyAwWRupc6c7t1ZJ9eXpKQM= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= -go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= -go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= -go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= -go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= -go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= -go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= -go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= -go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -240,10 +240,10 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= From b0f95ea2143f482078b1b02d2bd1fa04596778a9 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 3 Jul 2024 16:09:54 +0100 Subject: [PATCH 130/168] [chore] Fix formatting in loggingexporter README (#10528) Fix formatting in loggingexporter README. loggingexporter is deprecated. --- exporter/loggingexporter/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporter/loggingexporter/README.md b/exporter/loggingexporter/README.md index f6b7d9d9859..161060a6dd0 100644 --- a/exporter/loggingexporter/README.md +++ b/exporter/loggingexporter/README.md @@ -24,8 +24,8 @@ The following settings are optional: - `loglevel` (default = `info`): the log level of the logging export (debug|info|warn|error). When set to `debug`, pipeline data is verbosely - - **Note**: This option has been deprecated in favor of `verbosity` logged. + - **Note**: This option has been deprecated in favor of `verbosity` - `verbosity` (default = `normal`): the verbosity of the logging export (detailed|normal|basic). When set to `detailed`, pipeline data is verbosely logged. @@ -33,7 +33,7 @@ The following settings are optional: second. - `sampling_thereafter` (default = `500`): sampling rate after the initial messages are logged (every Mth message is logged). Refer to [Zap - docs](https://godoc.org/go.uber.org/zap/zapcore#NewSampler) for more details. + docs](https://godoc.org/go.uber.org/zap/zapcore#NewSampler) for more details on how sampling parameters impact number of messages. ### Note From cd639e5502ea0addc51bf566f6aacdbb2f745f3c Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Wed, 3 Jul 2024 08:12:02 -0700 Subject: [PATCH 131/168] [chore] Add for-all make target (#10522) Same as we have in contrib. Sometimes it's helpful to run a specific command in all modules not just a make target. For example, `CMD="go mod edit -replace go.opentelemetry.io/otel/sdk/metric=../opentelemetry-go/sdk/metric" make for-all` to debug go library issues. --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 60ee82a7681..e05b32e5309 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,16 @@ gotest-with-cover: goporto: $(PORTO) $(PORTO) -w --include-internal --skip-dirs "^cmd/mdatagen/third_party$$" ./ +.PHONY: for-all +for-all: + @echo "running $${CMD} in root" + @$${CMD} + @set -e; for dir in $(GOMODULES); do \ + (cd "$${dir}" && \ + echo "running $${CMD} in $${dir}" && \ + $${CMD} ); \ + done + .PHONY: golint golint: @$(MAKE) for-all-target TARGET="lint" From 8d3c19d55fb63d4ff4bd5181d3a0f4bb0483acf5 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 3 Jul 2024 17:12:52 +0200 Subject: [PATCH 132/168] [internal/localhostgate] Correctly log message about local host gate (#10529) Fixes log intended to be logged when the feature gate is enabled, not disabled. #### Link to tracking issue Relates to #8510, updates #10352 --------- Co-authored-by: Yang Song --- .chloggen/localhostgate-info-log.yaml | 25 +++++++++++++++++++++++++ internal/localhostgate/featuregate.go | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .chloggen/localhostgate-info-log.yaml diff --git a/.chloggen/localhostgate-info-log.yaml b/.chloggen/localhostgate-info-log.yaml new file mode 100644 index 00000000000..e366d2a2e97 --- /dev/null +++ b/.chloggen/localhostgate-info-log.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: internal/localhostgate + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Correctly log info message when `component.UseLocalHostAsDefaultHost` is enabled + +# One or more tracking issues or pull requests related to the change +issues: [8510] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/internal/localhostgate/featuregate.go b/internal/localhostgate/featuregate.go index 7c8ee7aeb49..568bbcdd786 100644 --- a/internal/localhostgate/featuregate.go +++ b/internal/localhostgate/featuregate.go @@ -59,9 +59,9 @@ func EndpointForPort(port int) string { // LogAboutUseLocalHostAsDefault logs about the upcoming change from 0.0.0.0 to localhost on server-like components. func LogAboutUseLocalHostAsDefault(logger *zap.Logger) { - if !UseLocalHostAsDefaultHostfeatureGate.IsEnabled() { + if UseLocalHostAsDefaultHostfeatureGate.IsEnabled() { logger.Info( - "The default endpoints for all servers in components have changed to use localhost instead of 0.0.0.0. Use the feature gate to temporarily revert to the previous default.", + "The default endpoints for all servers in components have changed to use localhost instead of 0.0.0.0. Disable the feature gate to temporarily revert to the previous default.", zap.String("feature gate ID", UseLocalHostAsDefaultHostID), ) } From 63ce4698fcb8c8fae78dff67d27194f594d200fc Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:11:35 -0700 Subject: [PATCH 133/168] [chore] bump go 1.21.12 (#10521) Removed the toolchain directive in pprof/go.mod as it's unnecessary Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/build-and-test.yml | 14 +++++++------- .github/workflows/tidy-dependencies.yml | 4 ++-- cmd/otelcorecol/go.mod | 2 +- pdata/pprofile/go.mod | 2 -- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e0ca03dbd73..f8479eb5c85 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.11 + go-version: ~1.21.12 cache: false - name: Cache Go id: go-cache @@ -45,7 +45,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.11 + go-version: ~1.21.12 cache: false - name: Cache Go id: go-cache @@ -69,7 +69,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.11 + go-version: ~1.21.12 cache: false - name: Cache Go id: go-cache @@ -94,7 +94,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.11 + go-version: ~1.21.12 cache: false - name: Cache Go id: go-cache @@ -141,7 +141,7 @@ jobs: strategy: matrix: runner: [ubuntu-latest] - go-version: ["~1.22", "~1.21.11"] # 1.20 needs quotes otherwise it's interpreted as 1.2 + go-version: ["~1.22", "~1.21.12"] # 1.20 needs quotes otherwise it's interpreted as 1.2 runs-on: ${{ matrix.runner }} needs: [setup-environment] steps: @@ -201,7 +201,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.11 + go-version: ~1.21.12 cache: false - name: Cache Go id: go-cache @@ -263,7 +263,7 @@ jobs: - name: Setup Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.11 + go-version: ~1.21.12 cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index 3cd2b665446..bc43d56e4ff 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -11,7 +11,7 @@ permissions: jobs: setup-environment: permissions: - contents: write # for Git to git push + contents: write # for Git to git push timeout-minutes: 30 runs-on: ubuntu-latest if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependency-major-update') && (github.actor == 'renovate[bot]' || contains(github.event.pull_request.labels.*.name, 'renovatebot')) }} @@ -21,7 +21,7 @@ jobs: ref: ${{ github.head_ref }} - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: ~1.21.11 + go-version: ~1.21.12 cache: false - name: Cache Go id: go-cache diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 3a0759384cc..550ffa05091 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -4,7 +4,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol go 1.21.0 -toolchain go1.21.11 +toolchain go1.21.12 require ( go.opentelemetry.io/collector/component v0.104.0 diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod index b955721f854..e92586fa830 100644 --- a/pdata/pprofile/go.mod +++ b/pdata/pprofile/go.mod @@ -2,8 +2,6 @@ module go.opentelemetry.io/collector/pdata/pprofile go 1.21.0 -toolchain go1.21.11 - require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/pdata v1.11.0 From 8d4b83bd7989fc7372d5c25abfb3e83ec3ee2349 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:17:31 -0700 Subject: [PATCH 134/168] fix(deps): update module github.com/rs/cors to v1.11.0 (#10045) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/rs/cors](https://togithub.com/rs/cors) | `v1.10.1` -> `v1.11.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2frs%2fcors/v1.11.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2frs%2fcors/v1.11.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2frs%2fcors/v1.10.1/v1.11.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2frs%2fcors/v1.10.1/v1.11.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
rs/cors (github.com/rs/cors) ### [`v1.11.0`](https://togithub.com/rs/cors/compare/v1.10.1...v1.11.0) [Compare Source](https://togithub.com/rs/cors/compare/v1.10.1...v1.11.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- config/confighttp/confighttp_test.go | 2 +- config/confighttp/go.mod | 2 +- config/confighttp/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- extension/zpagesextension/go.mod | 2 +- extension/zpagesextension/go.sum | 4 ++-- internal/e2e/go.mod | 2 +- internal/e2e/go.sum | 4 ++-- otelcol/go.sum | 4 ++-- otelcol/otelcoltest/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- service/go.mod | 2 +- service/go.sum | 4 ++-- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 550ffa05091..791f647f4cc 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -71,7 +71,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/rs/cors v1.10.1 // indirect + github.com/rs/cors v1.11.0 // indirect github.com/shirou/gopsutil/v4 v4.24.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.8.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 5149646ec1d..ce3a79aed35 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -113,8 +113,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= +github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= diff --git a/config/confighttp/confighttp_test.go b/config/confighttp/confighttp_test.go index 7e984569487..05261b23d3a 100644 --- a/config/confighttp/confighttp_test.go +++ b/config/confighttp/confighttp_test.go @@ -955,7 +955,7 @@ func verifyCorsResp(t *testing.T, url string, origin string, set *CORSConfig, ex req.Header.Set("Origin", origin) if extraHeader { req.Header.Set("ExtraHeader", "foo") - req.Header.Set("Access-Control-Request-Headers", "ExtraHeader") + req.Header.Set("Access-Control-Request-Headers", "extraheader") } req.Header.Set("Access-Control-Request-Method", "POST") diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 541aa6f3e9b..8556c2ee9d3 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -5,7 +5,7 @@ go 1.21.0 require ( github.com/golang/snappy v0.0.4 github.com/klauspost/compress v1.17.9 - github.com/rs/cors v1.10.1 + github.com/rs/cors v1.11.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.104.0 go.opentelemetry.io/collector/component v0.104.0 diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index 60238a7e37b..d2e1005ffc6 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -63,8 +63,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= +github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 155e8c121f5..2f05a5ee602 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -52,7 +52,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/rs/cors v1.10.1 // indirect + github.com/rs/cors v1.11.0 // indirect go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/config/internal v0.104.0 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index f915d3df73a..e318de2f457 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -70,8 +70,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= +github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 56bb087128c..20c2af3101c 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -44,7 +44,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/rs/cors v1.10.1 // indirect + github.com/rs/cors v1.11.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect go.opentelemetry.io/collector/config/configopaque v1.11.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index 91e53c9bc39..eb99adb801a 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -67,8 +67,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= +github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 8d140d5b953..906556bfe2f 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -54,7 +54,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/rs/cors v1.10.1 // indirect + github.com/rs/cors v1.11.0 // indirect go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect go.opentelemetry.io/collector/config/confignet v0.104.0 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index c16df16848f..b608e2040f8 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -72,8 +72,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= +github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/otelcol/go.sum b/otelcol/go.sum index 2cc9af2e3ed..f7773c9914c 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -111,8 +111,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= +github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum index 2cc9af2e3ed..f7773c9914c 100644 --- a/otelcol/otelcoltest/go.sum +++ b/otelcol/otelcoltest/go.sum @@ -111,8 +111,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= +github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index cc4accf4312..09ea5b0cc3c 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -53,7 +53,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/rs/cors v1.10.1 // indirect + github.com/rs/cors v1.11.0 // indirect go.opentelemetry.io/collector/config/configauth v0.104.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.11.0 // indirect go.opentelemetry.io/collector/config/configopaque v1.11.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index c16df16848f..b608e2040f8 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -72,8 +72,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= +github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/service/go.mod b/service/go.mod index 71b52d7cc1d..f45230170ed 100644 --- a/service/go.mod +++ b/service/go.mod @@ -74,7 +74,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/rs/cors v1.10.1 // indirect + github.com/rs/cors v1.11.0 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect diff --git a/service/go.sum b/service/go.sum index 0a665d9c098..8c3ba915d49 100644 --- a/service/go.sum +++ b/service/go.sum @@ -108,8 +108,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= +github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= From 18e78af093054cab5875418a7f02e9fbaa887a1a Mon Sep 17 00:00:00 2001 From: Mackenzie <63265430+mackjmr@users.noreply.github.com> Date: Wed, 3 Jul 2024 22:44:40 +0200 Subject: [PATCH 135/168] [chore] Update default otlp receiver address (#10531) #### Description See https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.104.0 and https://opentelemetry.io/blog/2024/hardening-the-collector-one. --- receiver/otlpreceiver/README.md | 2 +- receiver/otlpreceiver/config.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/receiver/otlpreceiver/README.md b/receiver/otlpreceiver/README.md index 255395fb5d6..98be8b39ffd 100644 --- a/receiver/otlpreceiver/README.md +++ b/receiver/otlpreceiver/README.md @@ -35,7 +35,7 @@ receivers: The following settings are configurable: -- `endpoint` (default = 0.0.0.0:4317 for grpc protocol, 0.0.0.0:4318 http protocol): +- `endpoint` (default = localhost:4317 for grpc protocol, localhost:4318 http protocol): host:port to which the receiver is going to receive data. The valid syntax is described at https://github.com/grpc/grpc/blob/master/doc/naming.md. The `component.UseLocalHostAsDefaultHost` feature gate changes these to localhost:4317 and diff --git a/receiver/otlpreceiver/config.md b/receiver/otlpreceiver/config.md index df6cf931a12..11d6433ce41 100644 --- a/receiver/otlpreceiver/config.md +++ b/receiver/otlpreceiver/config.md @@ -20,7 +20,7 @@ Config defines configuration for OTLP receiver. | Name | Type | Default | Docs | |------------------------|-----------------------------------------------------------------------|--------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| endpoint | string | 0.0.0.0:4317 | Endpoint configures the address for this network connection. For TCP and UDP networks, the address has the form "host:port". The host must be a literal IP address, or a host name that can be resolved to IP addresses. The port must be a literal port number or a service name. If the host is a literal IPv6 address it must be enclosed in square brackets, as in "[2001:db8::1]:80" or "[fe80::1%zone]:80". The zone specifies the scope of the literal IPv6 address as defined in RFC 4007. | +| endpoint | string | localhost:4317 | Endpoint configures the address for this network connection. For TCP and UDP networks, the address has the form "host:port". The host must be a literal IP address, or a host name that can be resolved to IP addresses. The port must be a literal port number or a service name. If the host is a literal IPv6 address it must be enclosed in square brackets, as in "[2001:db8::1]:80" or "[fe80::1%zone]:80". The zone specifies the scope of the literal IPv6 address as defined in RFC 4007. | | transport | string | tcp | Transport to use. Known protocols are "tcp", "tcp4" (IPv4-only), "tcp6" (IPv6-only), "udp", "udp4" (IPv4-only), "udp6" (IPv6-only), "ip", "ip4" (IPv4-only), "ip6" (IPv6-only), "unix", "unixgram" and "unixpacket". | | tls | [configtls-TLSServerSetting](#configtls-tlsserversetting) | | Configures the protocol to use TLS. The default value is nil, which will cause the protocol to not use TLS. | | max_recv_msg_size_mib | uint64 | | MaxRecvMsgSizeMiB sets the maximum size (in MiB) of messages accepted by the server. | @@ -73,7 +73,7 @@ Config defines configuration for OTLP receiver. | Name | Type | Default | Docs | |-----------------------|-----------------------------------------------------------|--------------|-----------------------------------------------------------------------------------------------------------------------------------------| -| endpoint | string | 0.0.0.0:4318 | Endpoint configures the listening address for the server. | +| endpoint | string | localhost:4318 | Endpoint configures the listening address for the server. | | tls | [configtls-TLSServerSetting](#configtls-tlsserversetting) | | TLSSetting struct exposes TLS client configuration. | | cors | [confighttp-CORSConfig](#confighttp-corsconfig) | | CORSConfig configures a receiver for HTTP cross-origin resource sharing (CORS). | | max_request_body_size | int | 0 | MaxRequestBodySize configures the maximum allowed body size in bytes for a single request. The default `0` means there's no restriction | From fab211d42611c78f8abf5c7d3b124f25739c6d77 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Thu, 4 Jul 2024 12:06:58 -0700 Subject: [PATCH 136/168] [chore] update global permissions on workflows (#10541) This addresses security concerns around permissions for workflows. Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/check-goreleaser.yaml | 3 +++ .github/workflows/generate-semantic-conventions-pr.yaml | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-goreleaser.yaml b/.github/workflows/check-goreleaser.yaml index 62d9f26b063..5b0ee1293ca 100644 --- a/.github/workflows/check-goreleaser.yaml +++ b/.github/workflows/check-goreleaser.yaml @@ -6,6 +6,9 @@ on: - "v[0-9]+.[0-9]+.[0-9]+*" pull_request: +permissions: + contents: read + jobs: check: runs-on: ubuntu-latest diff --git a/.github/workflows/generate-semantic-conventions-pr.yaml b/.github/workflows/generate-semantic-conventions-pr.yaml index 10c30d2830f..f7abd2cd8b4 100644 --- a/.github/workflows/generate-semantic-conventions-pr.yaml +++ b/.github/workflows/generate-semantic-conventions-pr.yaml @@ -3,9 +3,12 @@ name: Generate Semantic Conventions PR on: schedule: # Daily at 01:30 (UTC) - - cron: '30 1 * * *' + - cron: "30 1 * * *" workflow_dispatch: +permissions: + contents: read + jobs: check-versions: runs-on: ubuntu-latest @@ -47,7 +50,7 @@ jobs: update-semantic-conventions: permissions: - contents: write # for Git to git push + contents: write # for Git to git push runs-on: ubuntu-latest if: | needs.check-versions.outputs.already-added != 'true' && @@ -94,7 +97,7 @@ jobs: --base main) pull_request_number=${url//*\//} - + # see the template for change log entry file at blob/main/.chloggen/TEMPLATE.yaml cat > .chloggen/semconv-$VERSION.yaml << EOF change_type: enhancement From af33ac5acc08dbeb43426f86b526d2cfd29318ab Mon Sep 17 00:00:00 2001 From: Armin Ruech <7052238+arminru@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:44:12 +0200 Subject: [PATCH 137/168] [chore] Fix comments and clarify docs on `config/configtls` (#10441) #### Description Point out that `config/configtls` also applies to HTTPS --------- Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- config/configtls/README.md | 5 +++-- config/configtls/configtls.go | 8 +++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/config/configtls/README.md b/config/configtls/README.md index cdc8d31663b..b7ea4e84e76 100644 --- a/config/configtls/README.md +++ b/config/configtls/README.md @@ -11,8 +11,9 @@ Note that mutual TLS (mTLS) is also supported. By default, TLS is enabled: - `insecure` (default = false): whether to enable client transport security for - the exporter's gRPC connection. See - [grpc.WithInsecure()](https://godoc.org/google.golang.org/grpc#WithInsecure). + the exporter's HTTPs or gRPC connection. See + [grpc.WithInsecure()](https://godoc.org/google.golang.org/grpc#WithInsecure) + for gRPC. As a result, the following parameters are also required: diff --git a/config/configtls/configtls.go b/config/configtls/configtls.go index 569ae606152..2ce0490b16c 100644 --- a/config/configtls/configtls.go +++ b/config/configtls/configtls.go @@ -86,11 +86,9 @@ type ClientConfig struct { // These are config options specific to client connections. - // In gRPC when set to true, this is used to disable the client transport security. - // See https://godoc.org/google.golang.org/grpc#WithInsecure. - // In HTTP, this disables verifying the server's certificate chain and host name - // (InsecureSkipVerify in the tls Config). Please refer to - // https://godoc.org/crypto/tls#Config for more information. + // In gRPC and HTTP when set to true, this is used to disable the client transport security. + // See https://godoc.org/google.golang.org/grpc#WithInsecure for gRPC. + // Please refer to https://godoc.org/crypto/tls#Config for more information. // (optional, default false) Insecure bool `mapstructure:"insecure"` // InsecureSkipVerify will enable TLS but not verify the certificate. From e014c1ed756cfc04c58e4222ea65d34a41705984 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Fri, 5 Jul 2024 06:57:26 -0700 Subject: [PATCH 138/168] [chore] bump config package dep (#10545) Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/mdatagen/go.mod | 2 +- cmd/mdatagen/go.sum | 4 +- cmd/otelcorecol/go.mod | 13 ++++--- cmd/otelcorecol/go.sum | 26 ++++++++----- config/configgrpc/go.mod | 2 +- config/configgrpc/go.sum | 4 +- config/confighttp/go.mod | 2 +- config/confighttp/go.sum | 4 +- connector/forwardconnector/go.mod | 2 +- connector/forwardconnector/go.sum | 4 +- connector/go.mod | 2 +- connector/go.sum | 4 +- exporter/debugexporter/go.mod | 2 +- exporter/debugexporter/go.sum | 4 +- exporter/go.mod | 2 +- exporter/go.sum | 4 +- exporter/loggingexporter/go.mod | 2 +- exporter/loggingexporter/go.sum | 4 +- exporter/nopexporter/go.mod | 2 +- exporter/nopexporter/go.sum | 4 +- exporter/otlpexporter/go.mod | 25 +++++++------ exporter/otlpexporter/go.sum | 50 ++++++++++++++----------- exporter/otlphttpexporter/go.mod | 25 +++++++------ exporter/otlphttpexporter/go.sum | 50 ++++++++++++++----------- extension/ballastextension/go.mod | 2 +- extension/ballastextension/go.sum | 4 +- extension/memorylimiterextension/go.mod | 2 +- extension/memorylimiterextension/go.sum | 4 +- extension/zpagesextension/go.mod | 25 +++++++------ extension/zpagesextension/go.sum | 50 ++++++++++++++----------- go.mod | 25 +++++++------ go.sum | 50 ++++++++++++++----------- internal/e2e/go.mod | 25 +++++++------ internal/e2e/go.sum | 50 ++++++++++++++----------- otelcol/go.mod | 13 ++++--- otelcol/go.sum | 26 ++++++++----- otelcol/otelcoltest/go.mod | 13 ++++--- otelcol/otelcoltest/go.sum | 26 ++++++++----- processor/batchprocessor/go.mod | 2 +- processor/batchprocessor/go.sum | 4 +- processor/go.mod | 2 +- processor/go.sum | 4 +- processor/memorylimiterprocessor/go.mod | 2 +- processor/memorylimiterprocessor/go.sum | 4 +- receiver/go.mod | 2 +- receiver/go.sum | 4 +- receiver/nopreceiver/go.mod | 2 +- receiver/nopreceiver/go.sum | 4 +- receiver/otlpreceiver/go.mod | 25 +++++++------ receiver/otlpreceiver/go.sum | 50 ++++++++++++++----------- service/go.mod | 13 ++++--- service/go.sum | 26 ++++++++----- 52 files changed, 396 insertions(+), 306 deletions(-) diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 5163d7f0ef8..391e95aa41e 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -53,7 +53,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index dba5d90abd5..44e2f6b846f 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -113,8 +113,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 791f647f4cc..018d55d98e5 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -97,23 +97,26 @@ require ( go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/collector/service v0.104.0 // indirect - go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index ce3a79aed35..b7bc898b227 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -145,8 +145,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= @@ -159,26 +159,32 @@ go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index ddb210db9d8..3fc8ec0466a 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -64,7 +64,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index 8c41da5ed5e..929534b788a 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -123,8 +123,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 8556c2ee9d3..ae7a408c9d9 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -58,7 +58,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index d2e1005ffc6..5ad218bdf0b 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -120,8 +120,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index e68d1e8d1c6..3efa2191275 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -50,7 +50,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index dba5d90abd5..44e2f6b846f 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -113,8 +113,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/connector/go.mod b/connector/go.mod index 66f2e02cae7..efec0be694c 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -42,7 +42,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/connector/go.sum b/connector/go.sum index 591d3eb7928..11d5883d94e 100644 --- a/connector/go.sum +++ b/connector/go.sum @@ -99,8 +99,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index c0660f70298..14091280956 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -56,7 +56,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index 3a2bf1f7be2..9c1f0e7c31d 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -115,8 +115,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/exporter/go.mod b/exporter/go.mod index 8f9ef86c134..5c565aeae6e 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -56,7 +56,7 @@ require ( go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/go.sum b/exporter/go.sum index 3a2bf1f7be2..9c1f0e7c31d 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -115,8 +115,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index ecce5838d1d..b119eccc5f0 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -55,7 +55,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 3a2bf1f7be2..9c1f0e7c31d 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -115,8 +115,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index aa3a32d1e2a..fad8fe237d0 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -50,7 +50,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index 3a2bf1f7be2..9c1f0e7c31d 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -115,8 +115,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index a001cd71559..31916bc491c 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -19,7 +19,7 @@ require ( go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 ) @@ -62,27 +62,30 @@ require ( go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect - go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 386bc449f92..112a1aca9a5 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -76,38 +76,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -145,10 +151,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 2f05a5ee602..a63a5739ce6 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/pdata v1.11.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 ) @@ -60,27 +60,30 @@ require ( go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect - go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index e318de2f457..37be6821d60 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -78,38 +78,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -147,10 +153,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 458fe3c430d..4b173a57d26 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -54,7 +54,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index 82521020878..b035a4381f2 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -121,8 +121,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index b64ce6a1b28..c4e978ed9d6 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -53,7 +53,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index 82521020878..b035a4381f2 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -121,8 +121,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 20c2af3101c..72b3bacf385 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -53,26 +53,29 @@ require ( go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect - go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index eb99adb801a..8e42884cef3 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -73,40 +73,46 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -144,10 +150,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/go.mod b/go.mod index a369d04150b..db1d6895d6f 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( go.opentelemetry.io/collector/featuregate v1.11.0 go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/collector/pdata/testdata v0.104.0 - go.opentelemetry.io/contrib/config v0.7.0 + go.opentelemetry.io/contrib/config v0.8.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -61,24 +61,27 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index ac14452d95f..13e7075f64d 100644 --- a/go.sum +++ b/go.sum @@ -83,36 +83,42 @@ 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.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -154,10 +160,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 906556bfe2f..14a87a26d9c 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -64,30 +64,33 @@ require ( go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect - go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index b608e2040f8..8af7284e171 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -80,40 +80,46 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -151,10 +157,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/otelcol/go.mod b/otelcol/go.mod index abd040ae889..e67e1767f0b 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -68,20 +68,23 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect - go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index f7773c9914c..55ea165d93d 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -143,8 +143,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= @@ -155,26 +155,32 @@ go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index ddd500a9a7a..d63ae65f645 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -68,20 +68,23 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect - go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum index f7773c9914c..55ea165d93d 100644 --- a/otelcol/otelcoltest/go.sum +++ b/otelcol/otelcoltest/go.sum @@ -143,8 +143,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= @@ -155,26 +155,32 @@ go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index b14615db00b..eacb3f12edd 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -52,7 +52,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index dba5d90abd5..44e2f6b846f 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -113,8 +113,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/processor/go.mod b/processor/go.mod index fe9cb2102d1..a5b1da649d7 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -42,7 +42,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/processor/go.sum b/processor/go.sum index 591d3eb7928..11d5883d94e 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -99,8 +99,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 920acd96311..c27bff150b3 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -59,7 +59,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index a748f76a7fc..3b808cd02a4 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -132,8 +132,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/receiver/go.mod b/receiver/go.mod index 2ca3adf9a84..881a9d968f0 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -40,7 +40,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/receiver/go.sum b/receiver/go.sum index 591d3eb7928..11d5883d94e 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -99,8 +99,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index 03308ae22bd..486d8d37834 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -49,7 +49,7 @@ require ( golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/receiver/nopreceiver/go.sum b/receiver/nopreceiver/go.sum index dba5d90abd5..44e2f6b846f 100644 --- a/receiver/nopreceiver/go.sum +++ b/receiver/nopreceiver/go.sum @@ -113,8 +113,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 09ea5b0cc3c..23659973de9 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -19,7 +19,7 @@ require ( go.opentelemetry.io/collector/receiver v0.104.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 ) @@ -63,28 +63,31 @@ require ( go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect - go.opentelemetry.io/contrib/config v0.7.0 // indirect + go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index b608e2040f8..8af7284e171 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -80,40 +80,46 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 h1:/jlt1Y8gXWiHG9FBx6cJaIC5hYx5Fe64nC8w5Cylt/0= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0/go.mod h1:bmToOGOBZ4hA9ghphIc1PAf66VA8KOtsuy3+ScStG20= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= -go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= 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= @@ -151,10 +157,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/service/go.mod b/service/go.mod index f45230170ed..b3a1ef95dab 100644 --- a/service/go.mod +++ b/service/go.mod @@ -26,7 +26,7 @@ require ( go.opentelemetry.io/collector/processor v0.104.0 go.opentelemetry.io/collector/receiver v0.104.0 go.opentelemetry.io/collector/semconv v0.104.0 - go.opentelemetry.io/contrib/config v0.7.0 + go.opentelemetry.io/contrib/config v0.8.0 go.opentelemetry.io/contrib/propagators/b3 v1.27.0 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/bridge/opencensus v1.28.0 @@ -88,10 +88,13 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect + go.opentelemetry.io/otel/log v0.4.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sys v0.21.0 // indirect diff --git a/service/go.sum b/service/go.sum index 8c3ba915d49..2a9dedcf58e 100644 --- a/service/go.sum +++ b/service/go.sum @@ -135,8 +135,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/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/contrib/config v0.7.0 h1:b1rK5tGTuhhPirJiMxOcyQfZs76j2VapY6ODn3b2Dbs= -go.opentelemetry.io/contrib/config v0.7.0/go.mod h1:8tdiFd8N5etOi3XzBmAoMxplEzI3TcL8dU5rM5/xcOQ= +go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= +go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= @@ -147,26 +147,32 @@ go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 h1:/0YaXu3755A/cFbtXp+21lkXgI0QE5avTWA2HjU9/WE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0/go.mod h1:m7SFxp0/7IxmJPLIY3JhOcU9CoFzDaCPL6xxQIxhA+o= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 h1:EVSnY9JbEEW92bEkIYOVMw4q1WJxIAGoFTrtYOzWuRQ= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0/go.mod h1:Ea1N1QQryNXpCD0I1fdLibBAIpQuBkznMmkdKrapk1Y= +go.opentelemetry.io/otel/log v0.4.0 h1:/vZ+3Utqh18e8TPjuc3ecg284078KWrR8BRz+PQAj3o= +go.opentelemetry.io/otel/log v0.4.0/go.mod h1:DhGnQvky7pHy82MIRV43iXh3FlKN8UUKftn0KbLOq6I= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/log v0.4.0 h1:1mMI22L82zLqf6KtkjrRy5BbagOTWdJsqMY/HSqILAA= +go.opentelemetry.io/otel/sdk/log v0.4.0/go.mod h1:AYJ9FVF0hNOgAVzUG/ybg/QttnXhUePWAupmCqtdESo= go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= From 6fca9ee370d8a13f673f9c273e45e374c4dfc168 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Fri, 5 Jul 2024 09:13:14 -0700 Subject: [PATCH 139/168] [service] add internal factory method for meter provider (#10415) This will be used when moving the meter provider configuration to use the otel-go config package. Part of #10414 Skipping changelog as there's no usage of this method yet. It will be done in a separate PR --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- service/telemetry/internal/factory.go | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/service/telemetry/internal/factory.go b/service/telemetry/internal/factory.go index 9afd6bd06c3..5e8149d7401 100644 --- a/service/telemetry/internal/factory.go +++ b/service/telemetry/internal/factory.go @@ -6,6 +6,8 @@ package internal // import "go.opentelemetry.io/collector/service/telemetry/inte import ( "context" + "go.opentelemetry.io/otel/metric" + metricnoop "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" tracenoop "go.opentelemetry.io/otel/trace/noop" "go.uber.org/zap" @@ -34,7 +36,8 @@ type Factory interface { // CreateTracerProvider creates a TracerProvider. CreateTracerProvider(ctx context.Context, set Settings, cfg component.Config) (trace.TracerProvider, error) - // TODO: Add CreateMeterProvider. + // CreateMeterProvider creates a MeterProvider. + CreateMeterProvider(ctx context.Context, set Settings, cfg component.Config) (metric.MeterProvider, error) // unexportedFactoryFunc is used to prevent external implementations of Factory. unexportedFactoryFunc() @@ -62,6 +65,7 @@ type factory struct { createDefaultConfig component.CreateDefaultConfigFunc CreateLoggerFunc CreateTracerProviderFunc + CreateMeterProviderFunc } func (f *factory) CreateDefaultConfig() component.Config { @@ -102,6 +106,23 @@ func (f *factory) CreateTracerProvider(ctx context.Context, set Settings, cfg co return f.CreateTracerProviderFunc(ctx, set, cfg) } +// CreateMeterProviderFunc is the equivalent of Factory.CreateMeterProvider. +type CreateMeterProviderFunc func(context.Context, Settings, component.Config) (metric.MeterProvider, error) + +// WithMeterProvider overrides the default no-op meter provider. +func WithMeterProvider(createMeterProvider CreateMeterProviderFunc) FactoryOption { + return factoryOptionFunc(func(o *factory) { + o.CreateMeterProviderFunc = createMeterProvider + }) +} + +func (f *factory) CreateMeterProvider(ctx context.Context, set Settings, cfg component.Config) (metric.MeterProvider, error) { + if f.CreateMeterProviderFunc == nil { + return metricnoop.NewMeterProvider(), nil + } + return f.CreateMeterProviderFunc(ctx, set, cfg) +} + func (f *factory) unexportedFactoryFunc() {} // NewFactory returns a new Factory. From 5a8d03944020b3c5a11aa3766a7657d36b86decd Mon Sep 17 00:00:00 2001 From: ASAKURA Kazuki <32762324+Arthur1@users.noreply.github.com> Date: Sat, 6 Jul 2024 01:15:51 +0900 Subject: [PATCH 140/168] [mdatagen] bugfix: fix generated package test when skipping goleak, because os package import is forgotten (#10486) #### Description When `tests.goleak.skip` flag is set to true, the generated_package_test.go is missing the `import os` statement. I added the missing import in this PR. #### Testing Compare the generated generated_package_test.go when tests.goleak.skip flag is toggle from false to true. **before** ```diff --- a/receiver/runnreceiver/generated_package_test.go +++ b/receiver/runnreceiver/generated_package_test.go @@ -3,10 +3,10 @@ package runnreceiver import ( - "go.uber.org/goleak" "testing" ) func TestMain(m *testing.M) { - goleak.VerifyTestMain(m) + // skipping goleak test as per metadata.yml configuration + os.Exit(m.Run()) } ``` **after** ```diff --- a/receiver/runnreceiver/generated_package_test.go +++ b/receiver/runnreceiver/generated_package_test.go @@ -3,10 +3,11 @@ package runnreceiver import ( - "go.uber.org/goleak" + "os" "testing" ) func TestMain(m *testing.M) { - goleak.VerifyTestMain(m) + // skipping goleak test as per metadata.yml configuration + os.Exit(m.Run()) } ``` --- cmd/mdatagen/templates/package_test.go.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/mdatagen/templates/package_test.go.tmpl b/cmd/mdatagen/templates/package_test.go.tmpl index 93446b7a5d7..892248f63df 100644 --- a/cmd/mdatagen/templates/package_test.go.tmpl +++ b/cmd/mdatagen/templates/package_test.go.tmpl @@ -3,6 +3,9 @@ package {{ if isCommand -}}main{{ else }}{{ .Package }}{{- end }} import ( + {{- if .Tests.GoLeak.Skip }} + "os" + {{- end }} "testing" {{- if not .Tests.GoLeak.Skip }} From b127da0890383628beeb30868f8b94a9a12263b1 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Fri, 5 Jul 2024 18:17:05 +0200 Subject: [PATCH 141/168] [chore] Make internal/featuregates into a module, move confmap fg there (#10532) #### Description Create new internal module `internal/featuregates`. This will be useful for importing feature gates while not creating a dependency cycle. I intend to use this for importing `confmap.strictlyTypedInput` in `otelcol` in a follow up PR. --- Makefile | 1 + cmd/builder/internal/builder/main_test.go | 1 + cmd/builder/test/core.builder.yaml | 1 + cmd/mdatagen/go.mod | 3 +++ cmd/otelcorecol/builder-config.yaml | 1 + cmd/otelcorecol/go.mod | 3 +++ config/configauth/go.mod | 3 +++ config/configgrpc/go.mod | 3 +++ config/confighttp/go.mod | 3 +++ config/internal/go.mod | 2 ++ confmap/confmap.go | 4 ++-- confmap/converter/expandconverter/go.mod | 16 ++-------------- confmap/expand.go | 4 ++-- confmap/go.mod | 5 ++++- confmap/internal/e2e/go.mod | 3 +++ confmap/internal/e2e/types_test.go | 8 ++++---- confmap/internal/featuregate.go | 14 -------------- confmap/provider/envprovider/go.mod | 3 +++ confmap/provider/fileprovider/go.mod | 3 +++ confmap/provider/httpprovider/go.mod | 3 +++ confmap/provider/httpsprovider/go.mod | 3 +++ confmap/provider/yamlprovider/go.mod | 3 +++ connector/forwardconnector/go.mod | 3 +++ connector/go.mod | 2 ++ exporter/debugexporter/go.mod | 3 +++ exporter/go.mod | 3 +++ exporter/loggingexporter/go.mod | 3 +++ exporter/nopexporter/go.mod | 3 +++ exporter/otlpexporter/go.mod | 3 +++ exporter/otlphttpexporter/go.mod | 3 +++ extension/auth/go.mod | 3 +++ extension/ballastextension/go.mod | 3 +++ extension/go.mod | 3 +++ extension/memorylimiterextension/go.mod | 3 +++ extension/zpagesextension/go.mod | 3 +++ filter/go.mod | 3 +++ go.mod | 3 +++ internal/e2e/go.mod | 3 +++ internal/featuregates/Makefile | 1 + internal/featuregates/featuregates.go | 8 ++++++++ internal/featuregates/go.mod | 12 ++++++++++++ internal/featuregates/go.sum | 14 ++++++++++++++ otelcol/go.mod | 5 ++++- otelcol/otelcoltest/go.mod | 3 +++ processor/batchprocessor/go.mod | 3 +++ processor/go.mod | 2 ++ processor/memorylimiterprocessor/go.mod | 3 +++ receiver/go.mod | 2 ++ receiver/nopreceiver/go.mod | 3 +++ receiver/otlpreceiver/go.mod | 3 +++ service/go.mod | 3 +++ versions.yaml | 1 + 52 files changed, 162 insertions(+), 38 deletions(-) delete mode 100644 confmap/internal/featuregate.go create mode 100644 internal/featuregates/Makefile create mode 100644 internal/featuregates/go.mod create mode 100644 internal/featuregates/go.sum diff --git a/Makefile b/Makefile index e05b32e5309..7806c1dd54e 100644 --- a/Makefile +++ b/Makefile @@ -290,6 +290,7 @@ check-contrib: -replace go.opentelemetry.io/collector/extension/memorylimiterextension=$(CURDIR)/extension/memorylimiterextension \ -replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension \ -replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate \ + -replace go.opentelemetry.io/collector/internal/featuregates=$(CURDIR)/internal/featuregates \ -replace go.opentelemetry.io/collector/otelcol=$(CURDIR)/otelcol \ -replace go.opentelemetry.io/collector/otelcol/otelcoltest=$(CURDIR)/otelcol/otelcoltest \ -replace go.opentelemetry.io/collector/pdata=$(CURDIR)/pdata \ diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 91c70f9845f..3d8d36729c6 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -69,6 +69,7 @@ var ( "/extension/auth", "/extension/zpagesextension", "/featuregate", + "/internal/featuregates", "/processor", "/processor/batchprocessor", "/processor/memorylimiterprocessor", diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 260429422c1..39c7645efec 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -46,6 +46,7 @@ replaces: - go.opentelemetry.io/collector/extension/auth => ${WORKSPACE_DIR}/extension/auth - go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension - go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate + - go.opentelemetry.io/collector/internal/featuregates => ${WORKSPACE_DIR}/internal/featuregates - go.opentelemetry.io/collector/otelcol => ${WORKSPACE_DIR}/otelcol - go.opentelemetry.io/collector/otelcol/otelcoltest => ${WORKSPACE_DIR}/otelcol/otelcoltest - go.opentelemetry.io/collector/pdata => ${WORKSPACE_DIR}/pdata diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 391e95aa41e..2aef11aaa2c 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -48,6 +48,7 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -90,3 +91,5 @@ retract ( ) replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index be9be01815d..01253a71db4 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -41,6 +41,7 @@ providers: replaces: - go.opentelemetry.io/collector => ../../ + - go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates - go.opentelemetry.io/collector/otelcol => ../../otelcol - go.opentelemetry.io/collector/component => ../../component - go.opentelemetry.io/collector/config/configauth => ../../config/configauth diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 018d55d98e5..7bfd15d7031 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -94,6 +94,7 @@ require ( go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/collector/service v0.104.0 // indirect @@ -135,6 +136,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/otelcol => ../../otelcol replace go.opentelemetry.io/collector/component => ../../component diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 83af8506079..ba1c767c25c 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -24,6 +24,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -52,3 +53,5 @@ replace go.opentelemetry.io/collector/extension => ../../extension replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth replace go.opentelemetry.io/collector/featuregate => ../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 3fc8ec0466a..1f5ae0c4b6a 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -54,6 +54,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -71,6 +72,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/config/configauth => ../configauth replace go.opentelemetry.io/collector/config/configcompression => ../configcompression diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index ae7a408c9d9..42d67a43947 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -49,6 +49,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -66,6 +67,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/config/configauth => ../configauth replace go.opentelemetry.io/collector/config/configcompression => ../configcompression diff --git a/config/internal/go.mod b/config/internal/go.mod index dcc3ba5ac7c..7c7af60e026 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -35,3 +35,5 @@ replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/confmap/confmap.go b/confmap/confmap.go index 62c8fdd6068..c7c89df28bb 100644 --- a/confmap/confmap.go +++ b/confmap/confmap.go @@ -16,8 +16,8 @@ import ( "github.com/knadh/koanf/providers/confmap" "github.com/knadh/koanf/v2" - "go.opentelemetry.io/collector/confmap/internal" encoder "go.opentelemetry.io/collector/confmap/internal/mapstructure" + "go.opentelemetry.io/collector/internal/featuregates" ) const ( @@ -157,7 +157,7 @@ func decodeConfig(m *Conf, result any, errorUnused bool, skipTopLevelUnmarshaler ErrorUnused: errorUnused, Result: result, TagName: "mapstructure", - WeaklyTypedInput: !internal.StrictlyTypedInputGate.IsEnabled(), + WeaklyTypedInput: !featuregates.StrictlyTypedInputGate.IsEnabled(), MatchName: caseSensitiveMatchName, DecodeHook: mapstructure.ComposeDecodeHookFunc( expandNilStructPointersHookFunc(), diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index f0d150834bb..5fb77056d7b 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -4,9 +4,9 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.104.0 go.opentelemetry.io/collector/confmap v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -25,20 +25,8 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace go.opentelemetry.io/collector/component => ../../../component - replace go.opentelemetry.io/collector/confmap => ../.. -replace go.opentelemetry.io/collector => ../../.. - -replace go.opentelemetry.io/collector/config/configtelemetry => ../../../config/configtelemetry - -replace go.opentelemetry.io/collector/pdata/testdata => ../../../pdata/testdata - -replace go.opentelemetry.io/collector/pdata => ../../../pdata - replace go.opentelemetry.io/collector/featuregate => ../../../featuregate -replace go.opentelemetry.io/collector/consumer => ../../../consumer - -replace go.opentelemetry.io/collector/pdata/pprofile => ../../../pdata/pprofile +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/expand.go b/confmap/expand.go index efc4bb95911..8372ef120d2 100644 --- a/confmap/expand.go +++ b/confmap/expand.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "go.opentelemetry.io/collector/confmap/internal" + "go.opentelemetry.io/collector/internal/featuregates" ) // schemePattern defines the regexp pattern for scheme names. @@ -130,7 +130,7 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo } var repl string - if internal.StrictlyTypedInputGate.IsEnabled() { + if featuregates.StrictlyTypedInputGate.IsEnabled() { repl, err = expanded.AsString() } else { repl, err = toString(expanded) diff --git a/confmap/go.mod b/confmap/go.mod index 128fbdb14f1..114b54b6b74 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -8,7 +8,7 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 github.com/knadh/koanf/v2 v2.1.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -21,6 +21,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect ) retract ( @@ -29,3 +30,5 @@ retract ( ) replace go.opentelemetry.io/collector/featuregate => ../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod index 8ebcdd4800a..088c78d31d0 100644 --- a/confmap/internal/e2e/go.mod +++ b/confmap/internal/e2e/go.mod @@ -8,6 +8,7 @@ require ( go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0 go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/internal/featuregates v0.104.0 ) require ( @@ -32,3 +33,5 @@ replace go.opentelemetry.io/collector/confmap/provider/fileprovider => ../../pro replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../provider/envprovider replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/internal/e2e/types_test.go b/confmap/internal/e2e/types_test.go index a7d0a6e31ee..edd767f3ce4 100644 --- a/confmap/internal/e2e/types_test.go +++ b/confmap/internal/e2e/types_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/internal" "go.opentelemetry.io/collector/confmap/provider/envprovider" "go.opentelemetry.io/collector/confmap/provider/fileprovider" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/featuregates" ) type TargetField string @@ -259,11 +259,11 @@ func TestStrictTypeCasting(t *testing.T) { }, } - previousValue := internal.StrictlyTypedInputGate.IsEnabled() - err := featuregate.GlobalRegistry().Set(internal.StrictlyTypedInputID, true) + previousValue := featuregates.StrictlyTypedInputGate.IsEnabled() + err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, true) require.NoError(t, err) defer func() { - err := featuregate.GlobalRegistry().Set(internal.StrictlyTypedInputID, previousValue) + err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, previousValue) require.NoError(t, err) }() diff --git a/confmap/internal/featuregate.go b/confmap/internal/featuregate.go deleted file mode 100644 index 6e9b9ea8745..00000000000 --- a/confmap/internal/featuregate.go +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package internal // import "go.opentelemetry.io/collector/confmap/internal" - -import "go.opentelemetry.io/collector/featuregate" - -const StrictlyTypedInputID = "confmap.strictlyTypedInput" - -var StrictlyTypedInputGate = featuregate.GlobalRegistry().MustRegister(StrictlyTypedInputID, - featuregate.StageAlpha, - featuregate.WithRegisterFromVersion("v0.103.0"), - featuregate.WithRegisterDescription("Makes type casting rules during configuration unmarshaling stricter. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details."), -) diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index cd17275e2b1..791fe154a78 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -20,6 +20,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index 3c24a90ceb5..2692eb0cb2b 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -19,6 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index ab8c89e2735..c113c149f80 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -19,6 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index b66db34aaf0..5758eb43ee1 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -19,6 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index f3c856c1061..dac45209c9a 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -19,6 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 3efa2191275..1423c7eb006 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -39,6 +39,7 @@ require ( go.opentelemetry.io/collector v0.104.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -58,6 +59,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/connector => ../ diff --git a/connector/go.mod b/connector/go.mod index efec0be694c..a3ea7d52721 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -65,3 +65,5 @@ replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 14091280956..b811e43120b 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -44,6 +44,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect @@ -64,6 +65,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/exporter/go.mod b/exporter/go.mod index 5c565aeae6e..897c40a9b9e 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -52,6 +52,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect golang.org/x/net v0.26.0 // indirect @@ -63,6 +64,8 @@ require ( replace go.opentelemetry.io/collector => ../ +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates + replace go.opentelemetry.io/collector/component => ../component replace go.opentelemetry.io/collector/confmap => ../confmap diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index b119eccc5f0..77ba2dc5e67 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -44,6 +44,7 @@ require ( go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -63,6 +64,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index fad8fe237d0..bf83c0aa815 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -38,6 +38,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -72,6 +73,8 @@ replace go.opentelemetry.io/collector/receiver => ../../receiver replace go.opentelemetry.io/collector => ../.. +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 31916bc491c..5a0839b891d 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -60,6 +60,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect @@ -135,3 +136,5 @@ retract ( replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index a63a5739ce6..e0247c06c26 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -59,6 +59,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect @@ -131,3 +132,5 @@ retract ( ) replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 2af234e1c6c..4b810c91ded 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -34,6 +34,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -62,3 +63,5 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/featuregate => ../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 4b173a57d26..93ef8228d88 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -43,6 +43,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -62,6 +63,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/extension/go.mod b/extension/go.mod index efd236fcd58..0df2f37ad79 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -32,6 +32,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -59,3 +60,5 @@ replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry replace go.opentelemetry.io/collector/featuregate => ../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index c4e978ed9d6..2194c7fad89 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -42,6 +42,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -61,6 +62,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 72b3bacf385..5697df6b93e 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -52,6 +52,7 @@ require ( go.opentelemetry.io/collector/config/internal v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect @@ -119,3 +120,5 @@ replace go.opentelemetry.io/collector/extension/auth => ../auth replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/filter/go.mod b/filter/go.mod index f7ae2122b35..24da688f69e 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -18,6 +18,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -26,3 +27,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../confmap replace go.opentelemetry.io/collector/featuregate => ../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/go.mod b/go.mod index db1d6895d6f..10aa90ed23d 100644 --- a/go.mod +++ b/go.mod @@ -59,6 +59,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect @@ -109,3 +110,5 @@ retract ( ) replace go.opentelemetry.io/collector/pdata/pprofile => ./pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ./internal/featuregates diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 14a87a26d9c..5df26309380 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -63,6 +63,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect @@ -145,3 +146,5 @@ replace go.opentelemetry.io/collector/exporter => ../../exporter replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/internal/featuregates => ../featuregates diff --git a/internal/featuregates/Makefile b/internal/featuregates/Makefile new file mode 100644 index 00000000000..ded7a36092d --- /dev/null +++ b/internal/featuregates/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/internal/featuregates/featuregates.go b/internal/featuregates/featuregates.go index e74c75fe481..2cf0e081317 100644 --- a/internal/featuregates/featuregates.go +++ b/internal/featuregates/featuregates.go @@ -9,3 +9,11 @@ var UseUnifiedEnvVarExpansionRules = featuregate.GlobalRegistry().MustRegister(" featuregate.StageBeta, featuregate.WithRegisterFromVersion("v0.103.0"), featuregate.WithRegisterDescription("`${FOO}` will now be expanded as if it was `${env:FOO}` and no longer expands $ENV syntax. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. When this feature gate is stable, expandconverter will be removed.")) + +const StrictlyTypedInputID = "confmap.strictlyTypedInput" + +var StrictlyTypedInputGate = featuregate.GlobalRegistry().MustRegister(StrictlyTypedInputID, + featuregate.StageAlpha, + featuregate.WithRegisterFromVersion("v0.103.0"), + featuregate.WithRegisterDescription("Makes type casting rules during configuration unmarshaling stricter. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details."), +) diff --git a/internal/featuregates/go.mod b/internal/featuregates/go.mod new file mode 100644 index 00000000000..ec1b35fdd05 --- /dev/null +++ b/internal/featuregates/go.mod @@ -0,0 +1,12 @@ +module go.opentelemetry.io/collector/internal/featuregates + +go 1.21.0 + +require go.opentelemetry.io/collector/featuregate v1.11.0 + +require ( + github.com/hashicorp/go-version v1.7.0 // indirect + go.uber.org/multierr v1.11.0 // indirect +) + +replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/internal/featuregates/go.sum b/internal/featuregates/go.sum new file mode 100644 index 00000000000..e3ebd41c2e8 --- /dev/null +++ b/internal/featuregates/go.sum @@ -0,0 +1,14 @@ +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/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +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/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/otelcol/go.mod b/otelcol/go.mod index e67e1767f0b..76a97a4f195 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,7 +5,6 @@ go 1.21.0 require ( github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.104.0 go.opentelemetry.io/collector/component v0.104.0 go.opentelemetry.io/collector/config/configtelemetry v0.104.0 go.opentelemetry.io/collector/confmap v0.104.0 @@ -13,6 +12,7 @@ require ( go.opentelemetry.io/collector/exporter v0.104.0 go.opentelemetry.io/collector/extension v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/processor v0.104.0 go.opentelemetry.io/collector/receiver v0.104.0 go.opentelemetry.io/collector/service v0.104.0 @@ -63,6 +63,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector v0.104.0 // indirect go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect @@ -145,3 +146,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf replace go.opentelemetry.io/collector/config/configtls => ../config/configtls replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index d63ae65f645..aa7d16ace30 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -64,6 +64,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect @@ -163,3 +164,5 @@ replace go.opentelemetry.io/collector/exporter => ../../exporter replace go.opentelemetry.io/collector/semconv => ../../semconv replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index eacb3f12edd..6271ff8032b 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -45,6 +45,7 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect @@ -60,6 +61,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/processor => ../ replace go.opentelemetry.io/collector/component => ../../component diff --git a/processor/go.mod b/processor/go.mod index a5b1da649d7..7004061e549 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -65,3 +65,5 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index c27bff150b3..4c507704423 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -46,6 +46,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect @@ -67,6 +68,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/processor => ../ replace go.opentelemetry.io/collector/component => ../../component diff --git a/receiver/go.mod b/receiver/go.mod index 881a9d968f0..4e272137d21 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -65,3 +65,5 @@ retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index 486d8d37834..773526ba6b4 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -37,6 +37,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -71,6 +72,8 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con replace go.opentelemetry.io/collector => ../.. +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 23659973de9..a3045af3e76 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -62,6 +62,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect @@ -135,3 +136,5 @@ retract ( ) replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/service/go.mod b/service/go.mod index b3a1ef95dab..ab10298b758 100644 --- a/service/go.mod +++ b/service/go.mod @@ -85,6 +85,7 @@ require ( go.opentelemetry.io/collector/config/configtls v0.104.0 // indirect go.opentelemetry.io/collector/config/internal v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect @@ -153,3 +154,5 @@ replace go.opentelemetry.io/collector/config/configtls => ../config/configtls replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/versions.yaml b/versions.yaml index 782277f7abe..e22abc194fd 100644 --- a/versions.yaml +++ b/versions.yaml @@ -15,6 +15,7 @@ module-sets: version: v0.104.0 modules: - go.opentelemetry.io/collector + - go.opentelemetry.io/collector/internal/featuregates - go.opentelemetry.io/collector/cmd/builder - go.opentelemetry.io/collector/cmd/mdatagen - go.opentelemetry.io/collector/component From d545fb6a102caf06d3b15d2dba5e652bcbb000d4 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 8 Jul 2024 08:23:16 -0700 Subject: [PATCH 142/168] [exporterhelper] Fix incorrect deduplication of exporter queue metrics (#10550) Fix incorrect deduplication of otelcol_exporter_queue_size and otelcol_exporter_queue_capacity metrics if multiple exporters are used. Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/10444 The registered callbacks are ignored for now, which is the same behavior as before. Ideally, we would need to unregister them properly. --- ...ly-deduplicated-exporterhelper-metric.yaml | 20 +++++++ .../internal/metadata/generated_telemetry.go | 20 ++++--- cmd/mdatagen/templates/telemetry.go.tmpl | 30 ++++++----- .../internal/metadata/generated_telemetry.go | 22 +++++--- .../internal/metadata/generated_telemetry.go | 9 ++-- .../internal/metadata/generated_telemetry.go | 54 ++++++++++--------- 6 files changed, 98 insertions(+), 57 deletions(-) create mode 100644 .chloggen/fix-incorrectly-deduplicated-exporterhelper-metric.yaml diff --git a/.chloggen/fix-incorrectly-deduplicated-exporterhelper-metric.yaml b/.chloggen/fix-incorrectly-deduplicated-exporterhelper-metric.yaml new file mode 100644 index 00000000000..01e6ce6f27d --- /dev/null +++ b/.chloggen/fix-incorrectly-deduplicated-exporterhelper-metric.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix incorrect deduplication of otelcol_exporter_queue_size and otelcol_exporter_queue_capacity metrics if multiple exporters are used. + +# One or more tracking issues or pull requests related to the change +issues: [10444] + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go index f56e18ba5dc..8e737c817c9 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go @@ -67,11 +67,14 @@ func (builder *TelemetryBuilder) InitQueueLength(cb func() int64) error { "queue_length", metric.WithDescription("This metric is optional and therefore not initialized in NewTelemetryBuilder."), metric.WithUnit("1"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(cb(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) + if err != nil { + return err + } + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveInt64(builder.QueueLength, cb(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.QueueLength) return err } @@ -98,12 +101,13 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme "process_runtime_total_alloc_bytes", metric.WithDescription("Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')"), metric.WithUnit("By"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessRuntimeTotalAllocBytes(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) errs = errors.Join(errs, err) + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveInt64(builder.ProcessRuntimeTotalAllocBytes, builder.observeProcessRuntimeTotalAllocBytes(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ProcessRuntimeTotalAllocBytes) + errs = errors.Join(errs, err) builder.RequestDuration, err = builder.meter.Float64Histogram( "request_duration", metric.WithDescription("Duration of request"), diff --git a/cmd/mdatagen/templates/telemetry.go.tmpl b/cmd/mdatagen/templates/telemetry.go.tmpl index 992df6bf328..240a2a90985 100644 --- a/cmd/mdatagen/templates/telemetry.go.tmpl +++ b/cmd/mdatagen/templates/telemetry.go.tmpl @@ -60,7 +60,7 @@ func WithAttributeSet(set attribute.Set) telemetryBuilderOption { {{- end }} {{- range $name, $metric := .Telemetry.Metrics }} - {{- if $metric.Optional }} +{{- if $metric.Optional }} // Init{{ $name.Render }} configures the {{ $name.Render }} metric. func (builder *TelemetryBuilder) Init{{ $name.Render }}({{ if $metric.Data.Async -}}cb func() {{ $metric.Data.BasicType }}{{- end }}) error { var err error @@ -71,13 +71,16 @@ func (builder *TelemetryBuilder) Init{{ $name.Render }}({{ if $metric.Data.Async {{- if eq $metric.Data.Type "Histogram" -}} {{ if $metric.Data.Boundaries -}}metric.WithExplicitBucketBoundaries([]float64{ {{- range $metric.Data.Boundaries }} {{.}}, {{- end }} }...),{{- end }} {{- end }} - {{ if $metric.Data.Async -}} - metric.With{{ casesTitle $metric.Data.BasicType }}Callback(func(_ context.Context, o metric.{{ casesTitle $metric.Data.BasicType }}Observer) error { - o.Observe(cb(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), - {{- end }} ) + {{- if $metric.Data.Async }} + if err != nil { + return err + } + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.Observe{{ casesTitle $metric.Data.BasicType }}(builder.{{ $name.Render }}, cb(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.{{ $name.Render }}) + {{- end }} return err } @@ -117,14 +120,15 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme {{- if eq $metric.Data.Type "Histogram" -}} {{ if $metric.Data.Boundaries -}}metric.WithExplicitBucketBoundaries([]float64{ {{- range $metric.Data.Boundaries }} {{.}}, {{- end }} }...),{{- end }} {{- end }} - {{ if $metric.Data.Async -}} - metric.With{{ casesTitle $metric.Data.BasicType }}Callback(func(_ context.Context, o metric.{{ casesTitle $metric.Data.BasicType }}Observer) error { - o.Observe(builder.observe{{ $name.Render }}(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), - {{- end }} ) errs = errors.Join(errs, err) + {{- if $metric.Data.Async }} + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.Observe{{ casesTitle $metric.Data.BasicType }}(builder.{{ $name.Render }}, builder.observe{{ $name.Render }}(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.{{ $name.Render }}) + errs = errors.Join(errs, err) + {{- end }} {{- end }} {{- end }} return &builder, errs diff --git a/exporter/exporterhelper/internal/metadata/generated_telemetry.go b/exporter/exporterhelper/internal/metadata/generated_telemetry.go index 4383809885e..02eb0be9b4f 100644 --- a/exporter/exporterhelper/internal/metadata/generated_telemetry.go +++ b/exporter/exporterhelper/internal/metadata/generated_telemetry.go @@ -66,11 +66,14 @@ func (builder *TelemetryBuilder) InitExporterQueueCapacity(cb func() int64) erro "exporter_queue_capacity", metric.WithDescription("Fixed capacity of the retry queue (in batches)"), metric.WithUnit("1"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(cb(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) + if err != nil { + return err + } + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveInt64(builder.ExporterQueueCapacity, cb(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ExporterQueueCapacity) return err } @@ -81,11 +84,14 @@ func (builder *TelemetryBuilder) InitExporterQueueSize(cb func() int64) error { "exporter_queue_size", metric.WithDescription("Current size of the retry queue (in batches)"), metric.WithUnit("1"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(cb(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) + if err != nil { + return err + } + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveInt64(builder.ExporterQueueSize, cb(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ExporterQueueSize) return err } diff --git a/processor/batchprocessor/internal/metadata/generated_telemetry.go b/processor/batchprocessor/internal/metadata/generated_telemetry.go index d94151a61d2..a83123aba25 100644 --- a/processor/batchprocessor/internal/metadata/generated_telemetry.go +++ b/processor/batchprocessor/internal/metadata/generated_telemetry.go @@ -96,12 +96,13 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme "processor_batch_metadata_cardinality", metric.WithDescription("Number of distinct metadata value combinations being processed"), metric.WithUnit("1"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessorBatchMetadataCardinality(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) errs = errors.Join(errs, err) + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveInt64(builder.ProcessorBatchMetadataCardinality, builder.observeProcessorBatchMetadataCardinality(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ProcessorBatchMetadataCardinality) + errs = errors.Join(errs, err) builder.ProcessorBatchTimeoutTriggerSend, err = builder.meter.Int64Counter( "processor_batch_timeout_trigger_send", metric.WithDescription("Number of times the batch was sent due to a timeout trigger"), diff --git a/service/internal/metadata/generated_telemetry.go b/service/internal/metadata/generated_telemetry.go index dac0e287f35..a7929da8e7e 100644 --- a/service/internal/metadata/generated_telemetry.go +++ b/service/internal/metadata/generated_telemetry.go @@ -119,61 +119,67 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme "process_cpu_seconds", metric.WithDescription("Total CPU user and system time in seconds"), metric.WithUnit("s"), - metric.WithFloat64Callback(func(_ context.Context, o metric.Float64Observer) error { - o.Observe(builder.observeProcessCPUSeconds(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) errs = errors.Join(errs, err) + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveFloat64(builder.ProcessCPUSeconds, builder.observeProcessCPUSeconds(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ProcessCPUSeconds) + errs = errors.Join(errs, err) builder.ProcessMemoryRss, err = builder.meter.Int64ObservableGauge( "process_memory_rss", metric.WithDescription("Total physical memory (resident set size)"), metric.WithUnit("By"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessMemoryRss(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) errs = errors.Join(errs, err) + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveInt64(builder.ProcessMemoryRss, builder.observeProcessMemoryRss(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ProcessMemoryRss) + errs = errors.Join(errs, err) builder.ProcessRuntimeHeapAllocBytes, err = builder.meter.Int64ObservableGauge( "process_runtime_heap_alloc_bytes", metric.WithDescription("Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc')"), metric.WithUnit("By"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessRuntimeHeapAllocBytes(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) errs = errors.Join(errs, err) + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveInt64(builder.ProcessRuntimeHeapAllocBytes, builder.observeProcessRuntimeHeapAllocBytes(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ProcessRuntimeHeapAllocBytes) + errs = errors.Join(errs, err) builder.ProcessRuntimeTotalAllocBytes, err = builder.meter.Int64ObservableCounter( "process_runtime_total_alloc_bytes", metric.WithDescription("Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')"), metric.WithUnit("By"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessRuntimeTotalAllocBytes(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) errs = errors.Join(errs, err) + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveInt64(builder.ProcessRuntimeTotalAllocBytes, builder.observeProcessRuntimeTotalAllocBytes(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ProcessRuntimeTotalAllocBytes) + errs = errors.Join(errs, err) builder.ProcessRuntimeTotalSysMemoryBytes, err = builder.meter.Int64ObservableGauge( "process_runtime_total_sys_memory_bytes", metric.WithDescription("Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys')"), metric.WithUnit("By"), - metric.WithInt64Callback(func(_ context.Context, o metric.Int64Observer) error { - o.Observe(builder.observeProcessRuntimeTotalSysMemoryBytes(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) errs = errors.Join(errs, err) + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveInt64(builder.ProcessRuntimeTotalSysMemoryBytes, builder.observeProcessRuntimeTotalSysMemoryBytes(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ProcessRuntimeTotalSysMemoryBytes) + errs = errors.Join(errs, err) builder.ProcessUptime, err = builder.meter.Float64ObservableCounter( "process_uptime", metric.WithDescription("Uptime of the process"), metric.WithUnit("s"), - metric.WithFloat64Callback(func(_ context.Context, o metric.Float64Observer) error { - o.Observe(builder.observeProcessUptime(), metric.WithAttributeSet(builder.attributeSet)) - return nil - }), ) errs = errors.Join(errs, err) + _, err = builder.meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + o.ObserveFloat64(builder.ProcessUptime, builder.observeProcessUptime(), metric.WithAttributeSet(builder.attributeSet)) + return nil + }, builder.ProcessUptime) + errs = errors.Join(errs, err) return &builder, errs } From a2696fd9063a33b5a4b17ca6b64ea018b2e35782 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 8 Jul 2024 17:25:17 +0200 Subject: [PATCH 143/168] [chore] Use different name for telemetry level key (#10547) #### Description Renames key to avoid conflict in JSON format. #### Link to tracking issue Fixes #10537 --- service/telemetry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/telemetry.go b/service/telemetry.go index c2a67c7f16f..a44aaa4e4e4 100644 --- a/service/telemetry.go +++ b/service/telemetry.go @@ -24,7 +24,7 @@ import ( const ( zapKeyTelemetryAddress = "address" - zapKeyTelemetryLevel = "level" + zapKeyTelemetryLevel = "metrics level" ) type meterProvider struct { From a8b5f8dbf946d1d1bf6cbb6c600fc696fb70e03c Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 8 Jul 2024 18:43:46 +0200 Subject: [PATCH 144/168] [chore] Use string for unit type (#10555) #### Description Uses string type for `unit` field in mdatagen related files. #### Link to tracking issue Needed for #10554 --- .../internal/samplereceiver/metadata.yaml | 6 ++--- cmd/mdatagen/testdata/invalid_type_attr.yaml | 2 +- cmd/mdatagen/testdata/no_type_attr.yaml | 2 +- cmd/mdatagen/testdata/unused_attribute.yaml | 2 +- exporter/exporterhelper/metadata.yaml | 22 ++++++++--------- processor/batchprocessor/metadata.yaml | 8 +++---- processor/processorhelper/metadata.yaml | 24 +++++++++---------- receiver/receiverhelper/metadata.yaml | 12 +++++----- receiver/scraperhelper/metadata.yaml | 4 ++-- 9 files changed, 41 insertions(+), 41 deletions(-) diff --git a/cmd/mdatagen/internal/samplereceiver/metadata.yaml b/cmd/mdatagen/internal/samplereceiver/metadata.yaml index 1ccfa58b2b4..c7cf9e7da8e 100644 --- a/cmd/mdatagen/internal/samplereceiver/metadata.yaml +++ b/cmd/mdatagen/internal/samplereceiver/metadata.yaml @@ -110,7 +110,7 @@ metrics: optional.metric: enabled: false description: "[DEPRECATED] Gauge double metric disabled by default." - unit: 1 + unit: "1" gauge: value_type: double attributes: [string_attr, boolean_attr] @@ -155,7 +155,7 @@ telemetry: batch_size_trigger_send: enabled: true description: Number of times the batch was sent due to a size trigger - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -178,7 +178,7 @@ telemetry: enabled: true description: This metric is optional and therefore not initialized in NewTelemetryBuilder. extended_documentation: For example this metric only exists if feature A is enabled. - unit: 1 + unit: "1" optional: true gauge: async: true diff --git a/cmd/mdatagen/testdata/invalid_type_attr.yaml b/cmd/mdatagen/testdata/invalid_type_attr.yaml index ed951be6d6d..47eb3f1cff2 100644 --- a/cmd/mdatagen/testdata/invalid_type_attr.yaml +++ b/cmd/mdatagen/testdata/invalid_type_attr.yaml @@ -18,7 +18,7 @@ metrics: metric: enabled: true description: Metric. - unit: 1 + unit: "1" gauge: value_type: double attributes: [used_attr] diff --git a/cmd/mdatagen/testdata/no_type_attr.yaml b/cmd/mdatagen/testdata/no_type_attr.yaml index 914a9820bda..c267d218e75 100644 --- a/cmd/mdatagen/testdata/no_type_attr.yaml +++ b/cmd/mdatagen/testdata/no_type_attr.yaml @@ -17,7 +17,7 @@ metrics: metric: enabled: true description: Metric. - unit: 1 + unit: "1" gauge: value_type: double attributes: [used_attr] diff --git a/cmd/mdatagen/testdata/unused_attribute.yaml b/cmd/mdatagen/testdata/unused_attribute.yaml index cc0eb08f767..d71586a7714 100644 --- a/cmd/mdatagen/testdata/unused_attribute.yaml +++ b/cmd/mdatagen/testdata/unused_attribute.yaml @@ -23,7 +23,7 @@ metrics: metric: enabled: true description: Metric. - unit: 1 + unit: "1" gauge: value_type: double attributes: [used_attr] diff --git a/exporter/exporterhelper/metadata.yaml b/exporter/exporterhelper/metadata.yaml index 0703902f6f4..dea17a17089 100644 --- a/exporter/exporterhelper/metadata.yaml +++ b/exporter/exporterhelper/metadata.yaml @@ -12,7 +12,7 @@ telemetry: exporter_sent_spans: enabled: true description: Number of spans successfully sent to destination. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -20,7 +20,7 @@ telemetry: exporter_send_failed_spans: enabled: true description: Number of spans in failed attempts to send to destination. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -28,7 +28,7 @@ telemetry: exporter_enqueue_failed_spans: enabled: true description: Number of spans failed to be added to the sending queue. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -36,7 +36,7 @@ telemetry: exporter_sent_metric_points: enabled: true description: Number of metric points successfully sent to destination. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -44,7 +44,7 @@ telemetry: exporter_send_failed_metric_points: enabled: true description: Number of metric points in failed attempts to send to destination. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -52,7 +52,7 @@ telemetry: exporter_enqueue_failed_metric_points: enabled: true description: Number of metric points failed to be added to the sending queue. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -60,7 +60,7 @@ telemetry: exporter_sent_log_records: enabled: true description: Number of log record successfully sent to destination. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -68,7 +68,7 @@ telemetry: exporter_send_failed_log_records: enabled: true description: Number of log records in failed attempts to send to destination. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -76,7 +76,7 @@ telemetry: exporter_enqueue_failed_log_records: enabled: true description: Number of log records failed to be added to the sending queue. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -84,7 +84,7 @@ telemetry: exporter_queue_size: enabled: true description: Current size of the retry queue (in batches) - unit: 1 + unit: "1" optional: true gauge: value_type: int @@ -93,7 +93,7 @@ telemetry: exporter_queue_capacity: enabled: true description: Fixed capacity of the retry queue (in batches) - unit: 1 + unit: "1" optional: true gauge: value_type: int diff --git a/processor/batchprocessor/metadata.yaml b/processor/batchprocessor/metadata.yaml index 06e7065358a..b0d2458c9b4 100644 --- a/processor/batchprocessor/metadata.yaml +++ b/processor/batchprocessor/metadata.yaml @@ -14,21 +14,21 @@ telemetry: processor_batch_batch_size_trigger_send: enabled: true description: Number of times the batch was sent due to a size trigger - unit: 1 + unit: "1" sum: value_type: int monotonic: true processor_batch_timeout_trigger_send: enabled: true description: Number of times the batch was sent due to a timeout trigger - unit: 1 + unit: "1" sum: value_type: int monotonic: true processor_batch_batch_send_size: enabled: true description: Number of units in the batch - unit: 1 + unit: "1" histogram: value_type: int bucket_boundaries: [10, 25, 50, 75, 100, 250, 500, 750, 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 20000, 30000, 50000, 100000] @@ -42,7 +42,7 @@ telemetry: processor_batch_metadata_cardinality: enabled: true description: Number of distinct metadata value combinations being processed - unit: 1 + unit: "1" sum: value_type: int async: true diff --git a/processor/processorhelper/metadata.yaml b/processor/processorhelper/metadata.yaml index 2b6ec764d1e..a1baa27827d 100644 --- a/processor/processorhelper/metadata.yaml +++ b/processor/processorhelper/metadata.yaml @@ -12,7 +12,7 @@ telemetry: processor_accepted_spans: enabled: true description: Number of spans successfully pushed into the next component in the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -20,7 +20,7 @@ telemetry: processor_refused_spans: enabled: true description: Number of spans that were rejected by the next component in the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -28,7 +28,7 @@ telemetry: processor_dropped_spans: enabled: true description: Number of spans that were dropped. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -36,7 +36,7 @@ telemetry: processor_inserted_spans: enabled: true description: Number of spans that were inserted. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -44,7 +44,7 @@ telemetry: processor_accepted_metric_points: enabled: true description: Number of metric points successfully pushed into the next component in the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -52,7 +52,7 @@ telemetry: processor_refused_metric_points: enabled: true description: Number of metric points that were rejected by the next component in the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -60,7 +60,7 @@ telemetry: processor_dropped_metric_points: enabled: true description: Number of metric points that were dropped. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -68,7 +68,7 @@ telemetry: processor_inserted_metric_points: enabled: true description: Number of metric points that were inserted. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -76,7 +76,7 @@ telemetry: processor_accepted_log_records: enabled: true description: Number of log records successfully pushed into the next component in the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -84,7 +84,7 @@ telemetry: processor_refused_log_records: enabled: true description: Number of log records that were rejected by the next component in the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -92,7 +92,7 @@ telemetry: processor_dropped_log_records: enabled: true description: Number of log records that were dropped. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -100,7 +100,7 @@ telemetry: processor_inserted_log_records: enabled: true description: Number of log records that were inserted. - unit: 1 + unit: "1" sum: value_type: int monotonic: true diff --git a/receiver/receiverhelper/metadata.yaml b/receiver/receiverhelper/metadata.yaml index 2897d549a70..db8dec36922 100644 --- a/receiver/receiverhelper/metadata.yaml +++ b/receiver/receiverhelper/metadata.yaml @@ -12,7 +12,7 @@ telemetry: receiver_accepted_spans: enabled: true description: Number of spans successfully pushed into the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -20,7 +20,7 @@ telemetry: receiver_refused_spans: enabled: true description: Number of spans that could not be pushed into the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -28,7 +28,7 @@ telemetry: receiver_accepted_metric_points: enabled: true description: Number of metric points successfully pushed into the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -36,7 +36,7 @@ telemetry: receiver_refused_metric_points: enabled: true description: Number of metric points that could not be pushed into the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -44,7 +44,7 @@ telemetry: receiver_accepted_log_records: enabled: true description: Number of log records successfully pushed into the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -52,7 +52,7 @@ telemetry: receiver_refused_log_records: enabled: true description: Number of log records that could not be pushed into the pipeline. - unit: 1 + unit: "1" sum: value_type: int monotonic: true \ No newline at end of file diff --git a/receiver/scraperhelper/metadata.yaml b/receiver/scraperhelper/metadata.yaml index 33a1080e7dd..8cf497fcd2c 100644 --- a/receiver/scraperhelper/metadata.yaml +++ b/receiver/scraperhelper/metadata.yaml @@ -12,7 +12,7 @@ telemetry: scraper_scraped_metric_points: enabled: true description: Number of metric points successfully scraped. - unit: 1 + unit: "1" sum: value_type: int monotonic: true @@ -20,7 +20,7 @@ telemetry: scraper_errored_metric_points: enabled: true description: Number of metric points that were unable to be scraped. - unit: 1 + unit: "1" sum: value_type: int monotonic: true \ No newline at end of file From 4a11a3e096482da4b1660223defeb5e0b716e901 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 8 Jul 2024 18:46:28 +0200 Subject: [PATCH 145/168] [chore] Pin pseudoversion to make 'make update-otel' on contrib easier (#10558) #### Description Prepares for `make update-otel` by pinning an existing version for `internal/featuregates` --- cmd/mdatagen/go.mod | 2 +- cmd/otelcorecol/go.mod | 2 +- config/configauth/go.mod | 2 +- config/configgrpc/go.mod | 2 +- config/confighttp/go.mod | 2 +- confmap/converter/expandconverter/go.mod | 2 +- confmap/go.mod | 2 +- confmap/internal/e2e/go.mod | 2 +- confmap/provider/envprovider/go.mod | 2 +- confmap/provider/fileprovider/go.mod | 2 +- confmap/provider/httpprovider/go.mod | 2 +- confmap/provider/httpsprovider/go.mod | 2 +- confmap/provider/yamlprovider/go.mod | 2 +- connector/forwardconnector/go.mod | 2 +- exporter/debugexporter/go.mod | 2 +- exporter/go.mod | 2 +- exporter/loggingexporter/go.mod | 2 +- exporter/nopexporter/go.mod | 2 +- exporter/otlpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.mod | 2 +- extension/auth/go.mod | 2 +- extension/ballastextension/go.mod | 2 +- extension/go.mod | 2 +- extension/memorylimiterextension/go.mod | 2 +- extension/zpagesextension/go.mod | 2 +- filter/go.mod | 2 +- go.mod | 2 +- internal/e2e/go.mod | 2 +- otelcol/go.mod | 2 +- otelcol/otelcoltest/go.mod | 2 +- processor/batchprocessor/go.mod | 2 +- processor/memorylimiterprocessor/go.mod | 2 +- receiver/nopreceiver/go.mod | 2 +- receiver/otlpreceiver/go.mod | 2 +- service/go.mod | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 2aef11aaa2c..d25611c120d 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -48,7 +48,7 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 7bfd15d7031..7e3bf8cd4b4 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -94,7 +94,7 @@ require ( go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/collector/service v0.104.0 // indirect diff --git a/config/configauth/go.mod b/config/configauth/go.mod index ba1c767c25c..c76520ce297 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -24,7 +24,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 1f5ae0c4b6a..a0b2a056a80 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -54,7 +54,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 42d67a43947..6e3bfee3a17 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -49,7 +49,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index 5fb77056d7b..793423f0e32 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -6,7 +6,7 @@ require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/confmap v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/go.mod b/confmap/go.mod index 114b54b6b74..b4330c9bac7 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -8,7 +8,7 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 github.com/knadh/koanf/v2 v2.1.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 diff --git a/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod index 088c78d31d0..a24fa5ec0c4 100644 --- a/confmap/internal/e2e/go.mod +++ b/confmap/internal/e2e/go.mod @@ -8,7 +8,7 @@ require ( go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0 go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 - go.opentelemetry.io/collector/internal/featuregates v0.104.0 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 ) require ( diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index 791fe154a78..3d417b9f801 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -20,7 +20,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index 2692eb0cb2b..251ab0201f4 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -19,7 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index c113c149f80..129f7aa5823 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -19,7 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index 5758eb43ee1..ada9f4265e7 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -19,7 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index dac45209c9a..4f21c81c8a5 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -19,7 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 1423c7eb006..83a8f5916d6 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -39,7 +39,7 @@ require ( go.opentelemetry.io/collector v0.104.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index b811e43120b..34b8685d220 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -44,7 +44,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect diff --git a/exporter/go.mod b/exporter/go.mod index 897c40a9b9e..2d3d81590c6 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -52,7 +52,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect golang.org/x/net v0.26.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 77ba2dc5e67..720e3ffc97f 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -44,7 +44,7 @@ require ( go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index bf83c0aa815..aa61e4bc524 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -38,7 +38,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 5a0839b891d..b2927ad5564 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -60,7 +60,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index e0247c06c26..4ee52567c71 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -59,7 +59,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 4b810c91ded..a461ca34b15 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -34,7 +34,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 93ef8228d88..b7ce0f4774d 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -43,7 +43,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect diff --git a/extension/go.mod b/extension/go.mod index 0df2f37ad79..17980516316 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -32,7 +32,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 2194c7fad89..2cc7c61799d 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -42,7 +42,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 5697df6b93e..ec8891431b4 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -52,7 +52,7 @@ require ( go.opentelemetry.io/collector/config/internal v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect diff --git a/filter/go.mod b/filter/go.mod index 24da688f69e..6bff8067058 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -18,7 +18,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.mod b/go.mod index 10aa90ed23d..9a6657fa6b5 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 5df26309380..5d39e5fb1e0 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -63,7 +63,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index 76a97a4f195..145c7fec44a 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -12,7 +12,7 @@ require ( go.opentelemetry.io/collector/exporter v0.104.0 go.opentelemetry.io/collector/extension v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 go.opentelemetry.io/collector/processor v0.104.0 go.opentelemetry.io/collector/receiver v0.104.0 go.opentelemetry.io/collector/service v0.104.0 diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index aa7d16ace30..7a03a4e85ca 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -64,7 +64,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 6271ff8032b..992a5e13dfa 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -45,7 +45,7 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 4c507704423..3de18d33ae4 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -46,7 +46,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index 773526ba6b4..f8c132aec8a 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -37,7 +37,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index a3045af3e76..ae4d23d5e56 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -62,7 +62,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect diff --git a/service/go.mod b/service/go.mod index ab10298b758..da95dfe06ae 100644 --- a/service/go.mod +++ b/service/go.mod @@ -85,7 +85,7 @@ require ( go.opentelemetry.io/collector/config/configtls v0.104.0 // indirect go.opentelemetry.io/collector/config/internal v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect From 8de544b176179a21637baf094b833969786f4479 Mon Sep 17 00:00:00 2001 From: Kristina Pathak Date: Mon, 8 Jul 2024 12:06:53 -0700 Subject: [PATCH 146/168] [builder] more information for missing gomod error (#10475) #### Description improving an error message - a missing gomod field would be reported but without informing where in the config the field is missing. #### Link to tracking issue Fixes #10474 #### Testing Unit tests pass, added some tests for missing cases, manually tested new error looks like: ``` ../../bin/ocb_darwin_amd64 --config=./default.yaml 2024-06-27T11:39:10.316-0700 INFO internal/command.go:125 OpenTelemetry Collector Builder {"version": "", "date": "unknown"} 2024-06-27T11:39:10.319-0700 INFO internal/command.go:161 Using config file {"path": "./default.yaml"} Error: invalid configuration: receiver module at index 0: missing gomod specification for module; provider module at index 2: missing gomod specification for module ``` --- .chloggen/builder-empty-gomod-field.yaml | 25 ++++++++++++++++++ cmd/builder/internal/builder/config.go | 22 ++++++++-------- cmd/builder/internal/builder/config_test.go | 28 +++++++++++++++++---- 3 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 .chloggen/builder-empty-gomod-field.yaml diff --git a/.chloggen/builder-empty-gomod-field.yaml b/.chloggen/builder-empty-gomod-field.yaml new file mode 100644 index 00000000000..2ebba3ce204 --- /dev/null +++ b/.chloggen/builder-empty-gomod-field.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: builder + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: provide context when a module in the config is missing its gomod value + +# One or more tracking issues or pull requests related to the change +issues: [10474] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 8ce3316ea72..45636cd5fdf 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -19,8 +19,8 @@ import ( const defaultOtelColVersion = "0.104.0" -// ErrInvalidGoMod indicates an invalid gomod -var ErrInvalidGoMod = errors.New("invalid gomod specification for module") +// ErrMissingGoMod indicates an empty gomod field +var ErrMissingGoMod = errors.New("missing gomod specification for module") // Config holds the builder's configuration type Config struct { @@ -115,14 +115,14 @@ func NewDefaultConfig() Config { func (c *Config) Validate() error { var providersError error if c.Providers != nil { - providersError = validateModules(*c.Providers) + providersError = validateModules("provider", *c.Providers) } return multierr.Combine( - validateModules(c.Extensions), - validateModules(c.Receivers), - validateModules(c.Exporters), - validateModules(c.Processors), - validateModules(c.Connectors), + validateModules("extension", c.Extensions), + validateModules("receiver", c.Receivers), + validateModules("exporter", c.Exporters), + validateModules("processor", c.Processors), + validateModules("connector", c.Connectors), providersError, ) } @@ -235,10 +235,10 @@ func (c *Config) ParseModules() error { return nil } -func validateModules(mods []Module) error { - for _, mod := range mods { +func validateModules(name string, mods []Module) error { + for i, mod := range mods { if mod.GoMod == "" { - return fmt.Errorf("module %q: %w", mod.GoMod, ErrInvalidGoMod) + return fmt.Errorf("%s module at index %v: %w", name, i, ErrMissingGoMod) } } return nil diff --git a/cmd/builder/internal/builder/config_test.go b/cmd/builder/internal/builder/config_test.go index cd81b9f2887..9daf158cb8e 100644 --- a/cmd/builder/internal/builder/config_test.go +++ b/cmd/builder/internal/builder/config_test.go @@ -79,13 +79,22 @@ func TestModuleFromCore(t *testing.T) { assert.True(t, strings.HasPrefix(cfg.Extensions[0].Name, "otlpreceiver")) } -func TestInvalidModule(t *testing.T) { +func TestMissingModule(t *testing.T) { type invalidModuleTest struct { cfg Config err error } // prepare configurations := []invalidModuleTest{ + { + cfg: Config{ + Logger: zap.NewNop(), + Providers: &[]Module{{ + Import: "invalid", + }}, + }, + err: ErrMissingGoMod, + }, { cfg: Config{ Logger: zap.NewNop(), @@ -93,7 +102,7 @@ func TestInvalidModule(t *testing.T) { Import: "invalid", }}, }, - err: ErrInvalidGoMod, + err: ErrMissingGoMod, }, { cfg: Config{ @@ -102,7 +111,7 @@ func TestInvalidModule(t *testing.T) { Import: "invalid", }}, }, - err: ErrInvalidGoMod, + err: ErrMissingGoMod, }, { cfg: Config{ @@ -111,7 +120,7 @@ func TestInvalidModule(t *testing.T) { Import: "invali", }}, }, - err: ErrInvalidGoMod, + err: ErrMissingGoMod, }, { cfg: Config{ @@ -120,7 +129,16 @@ func TestInvalidModule(t *testing.T) { Import: "invalid", }}, }, - err: ErrInvalidGoMod, + err: ErrMissingGoMod, + }, + { + cfg: Config{ + Logger: zap.NewNop(), + Connectors: []Module{{ + Import: "invalid", + }}, + }, + err: ErrMissingGoMod, }, } From de8bd27544cdff07fa3d323d78111cb3eadf20a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 21:12:21 -0700 Subject: [PATCH 147/168] fix(deps): update all opentelemetry-go-contrib packages (#10565) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://togithub.com/open-telemetry/opentelemetry-go-contrib) | `v0.52.0` -> `v0.53.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fgoogle.golang.org%2fgrpc%2fotelgrpc/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fgoogle.golang.org%2fgrpc%2fotelgrpc/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fgoogle.golang.org%2fgrpc%2fotelgrpc/v0.52.0/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fgoogle.golang.org%2fgrpc%2fotelgrpc/v0.52.0/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://togithub.com/open-telemetry/opentelemetry-go-contrib) | `v0.52.0` -> `v0.53.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fnet%2fhttp%2fotelhttp/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fnet%2fhttp%2fotelhttp/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fnet%2fhttp%2fotelhttp/v0.52.0/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fnet%2fhttp%2fotelhttp/v0.52.0/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/contrib/propagators/b3](https://togithub.com/open-telemetry/opentelemetry-go-contrib) | `v1.27.0` -> `v1.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcontrib%2fpropagators%2fb3/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcontrib%2fpropagators%2fb3/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcontrib%2fpropagators%2fb3/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcontrib%2fpropagators%2fb3/v1.27.0/v1.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/contrib/zpages](https://togithub.com/open-telemetry/opentelemetry-go-contrib) | `v0.52.0` -> `v0.53.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcontrib%2fzpages/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcontrib%2fzpages/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcontrib%2fzpages/v0.52.0/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcontrib%2fzpages/v0.52.0/v0.53.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
open-telemetry/opentelemetry-go-contrib (go.opentelemetry.io/contrib/propagators/b3) ### [`v1.28.0`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v1.28.0): /v0.53.0/v0.22.0/v0.8.0/v0.3.0/v0.1.0 [Compare Source](https://togithub.com/open-telemetry/opentelemetry-go-contrib/compare/v1.27.0...v1.28.0) #### Overview ##### Added - Add the new `go.opentelemetry.io/contrib/detectors/azure/azurevm` package to provide a resource detector for Azure VMs. ([#​5422](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5422)) - Add support to configure views when creating MeterProvider using the config package. ([#​5654](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5654)) - The `go.opentelemetry.io/contrib/config` add support to configure periodic reader interval and timeout. ([#​5661](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5661)) - Add log support for the autoexport package. ([#​5733](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5733)) - Add support for disabling the old runtime metrics using the `OTEL_GO_X_DEPRECATED_RUNTIME_METRICS=false` environment variable. ([#​5747](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5747)) - Add support for signal-specific protocols environment variables (`OTEL_EXPORTER_OTLP_TRACES_PROTOCOL`, `OTEL_EXPORTER_OTLP_LOGS_PROTOCOL`, `OTEL_EXPORTER_OTLP_METRICS_PROTOCOL`) in `go.opentelemetry.io/contrib/exporters/autoexport`. ([#​5816](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5816)) - The `go.opentelemetry.io/contrib/processors/minsev` module is added. This module provides and experimental logging processor with a configurable threshold for the minimum severity records must have to be recorded. ([#​5817](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5817)) - The `go.opentelemetry.io/contrib/processors/baggagecopy` module. This module is a replacement of `go.opentelemetry.io/contrib/processors/baggage/baggagetrace`. ([#​5824](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5824)) ##### Changed - Improve performance of `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` with the usage of `WithAttributeSet()` instead of `WithAttribute()`. ([#​5664](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5664)) - Improve performance of `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` with the usage of `WithAttributeSet()` instead of `WithAttribute()`. ([#​5664](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5664)) - Update `go.opentelemetry.io/contrib/config` to latest released configuration schema which introduces breaking changes where `Attributes` is now a `map[string]interface{}`. ([#​5758](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5758)) - Upgrade all dependencies of `go.opentelemetry.io/otel/semconv/v1.25.0` to `go.opentelemetry.io/otel/semconv/v1.26.0`. ([#​5847](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5847)) ##### Fixed - Custom attributes targeting metrics recorded by the `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` are not ignored anymore. ([#​5129](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5129)) - The double setup in `go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/example` that caused duplicate traces. ([#​5564](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5564)) - The superfluous `response.WriteHeader` call in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` when the response writer is flushed. ([#​5634](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5634)) - Use `c.FullPath()` method to set `http.route` attribute in `go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin`. ([#​5734](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5734)) - Out-of-bounds panic in case of invalid span ID in `go.opentelemetry.io/contrib/propagators/b3`. ([#​5754](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5754)) ##### Deprecated - The `go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#​5550]. ([#​5645](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5645)) - The `go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#​5552]. ([#​5646](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5646)) - The `go.opentelemetry.io/contrib/samplers/aws/xray` package is deprecated. If you would like to become a Code Owner of this module and prevent it from being removed, see [#​5554]. ([#​5647](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5647)) - The `go.opentelemetry.io/contrib/processors/baggage/baggagetrace` package is deprecated. Use the added `go.opentelemetry.io/contrib/processors/baggagecopy` package instead. ([#​5824](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5824)) - Use `baggagecopy.NewSpanProcessor` as a replacement for `baggagetrace.New`. - `NewSpanProcessor` accepts a `Fitler` function type that selects which baggage members are added to a span. - `NewSpanProcessor` returns a `*baggagecopy.SpanProcessor` instead of a `trace.SpanProcessor` interface. The returned type still implements the interface. [#​5550]: https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5550 [#​5552]: https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5552 [#​5554]: https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5554 #### What's Changed - chore(deps): update module github.com/goccy/go-json to v0.10.3 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5623](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5623) - chore(deps): update k8s.io/kube-openapi digest to [`835d969`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/835d969) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5622](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5622) - chore(deps): update module github.com/go-logr/logr to v1.4.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5627](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5627) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.7 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5629](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5629) - fix(deps): update google.golang.org/genproto/googleapis/api digest to [`d264139`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/d264139) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5630](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5630) - fix(deps): update module go.opentelemetry.io/collector/pdata to v1.8.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5624](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5624) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`d264139`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/d264139) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5631](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5631) - Add deprecation notice to otelmongo by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5598](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5598) - Move unreleased changelog entry by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5637](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5637) - chore(deps): update module github.com/bytedance/sonic to v1.11.7 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5633](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5633) - fix(deps): update module golang.org/x/vuln to v1.1.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5650](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5650) - otelzap: Implement Write method by [@​khushijain21](https://togithub.com/khushijain21) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5620](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5620) - otelzap: Implement methods on arrayEncoder by [@​khushijain21](https://togithub.com/khushijain21) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5632](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5632) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.8 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5649](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5649) - Deprecate the AWS EC2 detector by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5636](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5636) - Deprecate the AWS ECS detector by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5638](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5638) - Deprecate otelmongo/test by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5639](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5639) - Deprecate the AWS EKS detector by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5640](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5640) - Deprecate the AWS Lambda detector by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5641](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5641) - Deprecate otellambda by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5642](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5642) - Deprecate otelaws by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5643](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5643) - Deprecate otelmux by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5644](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5644) - Deprecate otelecho by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5645](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5645) - Deprecate otelmacaron by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5646](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5646) - Deprecate the AWS propagators by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5647](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5647) - Deprecate the AWS XRAY sampler by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5648](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5648) - chore(deps): update module github.com/gabriel-vasile/mimetype to v1.4.4 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5660](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5660) - fix(deps): update module github.com/golangci/golangci-lint to v1.59.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5663](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5663) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.10 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5657](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5657) - fix(deps): update aws-sdk-go-v2 monorepo by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5658](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5658) - fix(deps): update golang.org/x/exp digest to [`4c93da0`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/4c93da0) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5662](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5662) - fix(deps): update golang.org/x/tools digest to [`7045d2e`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/7045d2e) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5651](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5651) - config: Add support to configure periodic reader interval and timeout by [@​bogdandrutu](https://togithub.com/bogdandrutu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5661](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5661) - Introduce respWriter.Flush so we don't write the status twice by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5634](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5634) - fix(deps): update golang.org/x/tools digest to [`cc29c91`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/cc29c91) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5667](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5667) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`a332354`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/a332354) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5668](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5668) - fix(deps): update google.golang.org/genproto/googleapis/api digest to [`a332354`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/a332354) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5669](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5669) - fix(deps): update golang.org/x/tools digest to [`f10a0f1`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/f10a0f1) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5670](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5670) - fix(deps): update google.golang.org/genproto/googleapis/api digest to [`5315273`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/5315273) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5671](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5671) - fix(deps): update golang.org/x/tools digest to [`cc29c91`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/cc29c91) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5673](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5673) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`5315273`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/5315273) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5672](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5672) - chore(deps): update module github.com/bytedance/sonic to v1.11.8 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5682](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5682) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.11 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5675](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5675) - otelzap: Implement methods on `arrayEncoder` by [@​khushijain21](https://togithub.com/khushijain21) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5652](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5652) - fix(deps): update module github.com/emicklei/go-restful/v3 to v3.12.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5679](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5679) - fix: custom attributes are ignored - [#​5084](https://togithub.com/open-telemetry/opentelemetry-go-contrib/issues/5084) by [@​zailic](https://togithub.com/zailic) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5129](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5129) - Use more efficient `WithAttributeSet()` by [@​ash2k](https://togithub.com/ash2k) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5664](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5664) - fix(deps): update golang.org/x/tools digest to [`e229045`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/e229045) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5674](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5674) - fix(deps): update golang.org/x/exp digest to [`23cca88`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/23cca88) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5677](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5677) - fix(deps): update module github.com/aws/aws-sdk-go-v2/service/dynamodb to v1.32.6 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5678](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5678) - Use passthrough resolver when bufnet is used by [@​ash2k](https://togithub.com/ash2k) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5676](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5676) - Add link to codeowners policy in codeowners file by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5680](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5680) - \[chore] ensure codecov uses token by [@​codeboten](https://togithub.com/codeboten) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5687](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5687) - fix(deps): update golang.org/x/tools digest to [`8d54ca1`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/8d54ca1) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5685](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5685) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.12 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5684](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5684) - fix(deps): update golang.org/x/tools digest to [`2e977dd`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/2e977dd) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5689](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5689) - fix: OTEL_TRACES_EXPORTER typo by [@​sysulq](https://togithub.com/sysulq) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5686](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5686) - Add otelhttp Handler.ServeHTTP and Transport.RoundTrip benchmarks by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5681](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5681) - Add codespell to CI by [@​SequoiaGod](https://togithub.com/SequoiaGod) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5683](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5683) - \[chore] Fix renovate config by [@​pellared](https://togithub.com/pellared) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5694](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5694) - otelzap: Implement With method by [@​khushijain21](https://togithub.com/khushijain21) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5653](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5653) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.13 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5691](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5691) - otelzap: Implement methods on encoder by [@​khushijain21](https://togithub.com/khushijain21) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5665](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5665) - chore(deps): update module github.com/prometheus/procfs to v0.15.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5696](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5696) - fix(deps): update golang.org/x/exp digest to [`404ba88`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/404ba88) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5695](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5695) - Add [@​pyohannes](https://togithub.com/pyohannes) as owner of EC2/ECS/EKS AWS detectors by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5656](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5656) - fix(deps): update golang.org/x/exp digest to [`fd00a4e`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/fd00a4e) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5697](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5697) - fix(deps): update golang.org/x/tools digest to [`2f8e378`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/2f8e378) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5690](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5690) - fix(deps): update golang.org/x/tools digest to [`cc29c91`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/cc29c91) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5698](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5698) - fix(deps): update golang.org/x/tools digest to [`58cc8a4`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/58cc8a4) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5708](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5708) - fix(deps): update module github.com/shirou/gopsutil/v3 to v3.24.5 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5701](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5701) - fix(deps): update golang.org/x/tools digest to [`018d3b2`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/018d3b2) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5710](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5710) - chore(deps): update module github.com/go-playground/validator/v10 to v10.21.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5705](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5705) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.14 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5699](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5699) - chore(deps): update module github.com/prometheus/common to v0.54.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5709](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5709) - fix(deps): update golang.org/x/tools digest to [`4478db0`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/4478db0) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5711](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5711) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.15 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5713](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5713) - fix(deps): update aws-sdk-go-v2 monorepo by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5714](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5714) - fix(deps): update golang.org/x/tools digest to [`cc29c91`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/cc29c91) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5715](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5715) - otelzap: Allow context injection via fields by [@​khushijain21](https://togithub.com/khushijain21) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5707](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5707) - fix(deps): update golang.org/x/tools digest to [`5e43887`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/5e43887) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5716](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5716) - chore(deps): update module golang.org/x/net to v0.26.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5725](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5725) - Add support to configure views with config.NewSdk by [@​bogdandrutu](https://togithub.com/bogdandrutu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5654](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5654) - otelzap: Implement Reflect method by [@​khushijain21](https://togithub.com/khushijain21) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5703](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5703) - Add [@​akats7](https://togithub.com/akats7) as a Code Owner by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5712](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5712) - Bump Go version used in CI by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5735](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5735) - fix(deps): update golang.org/x/exp digest to [`fc45aab`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/fc45aab) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5727](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5727) - chore(deps): update module golang.org/x/crypto to v0.24.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5722](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5722) - chore(deps): update module golang.org/x/sys to v0.21.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5731](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5731) - chore(deps): update module golang.org/x/mod to v0.18.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5723](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5723) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.16 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5724](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5724) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`ef581f9`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/ef581f9) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5726](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5726) - chore(deps): update module golang.org/x/oauth2 to v0.21.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5729](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5729) - fix(deps): update google.golang.org/genproto/googleapis/api digest to [`ef581f9`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/ef581f9) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5728](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5728) - fix(deps): update module golang.org/x/tools to v0.22.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5738](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5738) - otelgin: Using `c.FullPath()` to set `http.route` attribute by [@​NeoCN](https://togithub.com/NeoCN) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5734](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5734) - baggagetrace: Add baggage key predicate by [@​MikeGoldsmith](https://togithub.com/MikeGoldsmith) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5619](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5619) - fix(deps): update aws-sdk-go-v2 monorepo by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5740](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5740) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.18 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5739](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5739) - fix(deps): update module github.com/googlecloudplatform/opentelemetry-operations-go/detectors/gcp to v1.24.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5744](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5744) - fix(deps): update module golang.org/x/vuln to v1.1.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5742](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5742) - fix(deps): update aws-sdk-go-v2 monorepo by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5745](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5745) - fix(deps): update module github.com/aws/aws-sdk-go to v1.53.20 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5746](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5746) - fix(deps): update module github.com/golangci/golangci-lint to v1.59.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5748](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5748) - chore(deps): update module github.com/klauspost/cpuid/v2 to v2.2.8 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5750](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5750) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`a8a6208`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/a8a6208) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5751](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5751) - fix(deps): update google.golang.org/genproto/googleapis/api digest to [`a8a6208`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/a8a6208) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5752](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5752) - chore(deps): update module google.golang.org/protobuf to v1.34.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5755](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5755) - feat: add log support for autoexport by [@​sysulq](https://togithub.com/sysulq) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5733](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5733) - Fix otelhttptrace example to avoid duplicating the generated data by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5564](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5564) - Prepare for migration to new runtime metrics by [@​dashpole](https://togithub.com/dashpole) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5747](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5747) - HTTP Semconv migration Part3 Server - v1.24.0 support by [@​MadVikingGod](https://togithub.com/MadVikingGod) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5401](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5401) - Fix broken link by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5767](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5767) - Add a resource detector for Azure VMs by [@​pyohannes](https://togithub.com/pyohannes) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5422](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5422) - chore(deps): update codecov/codecov-action action to v4.5.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5763](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5763) - fix(deps): update module github.com/aws/aws-sdk-go to v1.54.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5756](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5756) - fix(deps): update module go.opentelemetry.io/proto/otlp to v1.3.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5757](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5757) - chore(deps): update module github.com/go-playground/validator/v10 to v10.22.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5759](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5759) - chore(deps): update module github.com/klauspost/compress to v1.17.9 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5760](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5760) - fix(deps): update golang.org/x/exp digest to [`7f521ea`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/7f521ea) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5764](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5764) - fix(deps): update module go.mongodb.org/mongo-driver to v1.15.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5766](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5766) - chore(deps): update module github.com/go-logr/logr to v1.4.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5768](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5768) - chore(deps): update module golang.org/x/sys to v0.21.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5770](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5770) - config: add support for logger provider configuration by [@​codeboten](https://togithub.com/codeboten) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5427](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5427) - fix(deps): update module go.opentelemetry.io/otel/sdk to v1.27.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5772](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5772) - chore(deps): update module k8s.io/klog/v2 to v2.130.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5771](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5771) - fix(deps): update module github.com/shirou/gopsutil/v3 to v4 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5702](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5702) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`68d350f`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/68d350f) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5774](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5774) - fix(deps): update google.golang.org/genproto/googleapis/api digest to [`68d350f`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/68d350f) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5775](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5775) - fix(deps): update aws-sdk-go-v2 monorepo by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5776](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5776) - fix(deps): update module github.com/aws/aws-sdk-go to v1.54.3 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5777](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5777) - fix(deps): update module go.opentelemetry.io/collector/pdata to v1.10.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5779](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5779) - fix(deps): update aws-sdk-go-v2 monorepo by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5783](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5783) - fix(deps): update module github.com/aws/aws-sdk-go to v1.54.4 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5781](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5781) - otelzap: Implement namespace method by [@​khushijain21](https://togithub.com/khushijain21) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5721](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5721) - chore(deps): update module k8s.io/klog/v2 to v2.130.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5788](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5788) - chore(deps): update module github.com/bytedance/sonic to v1.11.9 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5785](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5785) - fix(deps): update module github.com/aws/aws-sdk-go to v1.54.5 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5786](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5786) - fix(deps): update aws-sdk-go-v2 monorepo by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5787](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5787) - chore(deps): update k8s.io/kube-openapi digest to [`b456828`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/b456828) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5791](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5791) - fix(deps): update module github.com/aws/aws-sdk-go to v1.54.6 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5792](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5792) - fix(deps): update module github.com/aws/aws-sdk-go-v2/service/dynamodb to v1.33.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5793](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5793) - Update project approvers by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5778](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5778) - Do not fail CI on codecov create report by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5794](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5794) - Remove pdata dependency and use proto-go instead by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5789](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5789) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`dc46fd2`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/dc46fd2) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5798](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5798) - fix(deps): update google.golang.org/genproto/googleapis/api digest to [`dc46fd2`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/dc46fd2) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5799](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5799) - otelzap: Add severity text to log record by [@​thomasgouveia](https://togithub.com/thomasgouveia) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5797](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5797) - otelzap: Add Benchmarks by [@​khushijain21](https://togithub.com/khushijain21) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5784](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5784) - Add unconvert linter by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5802](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5802) - Add unparam linter by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5803](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5803) - Add tenv linter by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5801](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5801) - fix(deps): update module github.com/aws/aws-sdk-go to v1.54.8 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5800](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5800) - chore(deps): update module github.com/prometheus/common to v0.55.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5806](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5806) - Fix panic caused by invalid spanId with b3 propagator by [@​Cirilla-zmh](https://togithub.com/Cirilla-zmh) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5754](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5754) - config: update schema to v0.2.0 by [@​codeboten](https://togithub.com/codeboten) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5758](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5758) - fix(deps): update aws-sdk-go-v2 monorepo by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5814](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5814) - fix(deps): update module github.com/aws/aws-sdk-go to v1.54.9 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5815](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5815) - otelzap: add testable example and package documentation by [@​thomasgouveia](https://togithub.com/thomasgouveia) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5805](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5805) - Add errorlint linter by [@​dmathieu](https://togithub.com/dmathieu) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5804](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5804) - Rename BaggageKeyPredicate to Filter by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5809](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5809) - Return `SpanProcessor` ptr not `trace.SpanProcessor` from `baggagetrace.New` by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5810](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5810) - Do not panic for empty `baggagetrace.SpanProcessor` by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5811](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5811) - Do not alias baggage import by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5812](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5812) - Change BaggageKeyPredicate to filter baggage Members by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5813](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5813) - fix(deps): update module go.mongodb.org/mongo-driver to v1.16.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5821](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5821) - fix(deps): update module github.com/aws/aws-sdk-go to v1.54.10 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5820](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5820) - fix(deps): update module github.com/aws/smithy-go to v1.20.3 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5822](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5822) - Add comment to the safety of the uint8 cast by [@​MadVikingGod](https://togithub.com/MadVikingGod) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5819](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5819) - fix(deps): update module github.com/shirou/gopsutil/v4 to v4.24.6 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5827](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5827) - exporters/autoexport: add support for signal-specific protocols environment variables by [@​thomasgouveia](https://togithub.com/thomasgouveia) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5816](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5816) - Replace and deprecate `baggagetrace` by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5824](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5824) - Add the minsev package by [@​MrAlias](https://togithub.com/MrAlias) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5817](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5817) - chore(deps): update module github.com/go-logr/logr to v1.4.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5832](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5832) - chore(deps): update google.golang.org/genproto/googleapis/rpc digest to [`f6361c8`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/f6361c8) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5828](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5828) - fix(deps): update google.golang.org/genproto/googleapis/api digest to [`f6361c8`](https://togithub.com/open-telemetry/opentelemetry-go-contrib/commit/f6361c8) by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry/opentelemetry-go-contrib/pull/5829](https://togithub.com/open-telemetry/opentelemetry-go-contrib/pull/5829) - fix(deps): update aws-sdk-go-v2 monorepo by [@​renovate](https://togithub.com/renovate) in [https://github.com/open-telemetry
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 8 ++++---- cmd/otelcorecol/go.sum | 16 ++++++++-------- config/configgrpc/go.mod | 2 +- config/configgrpc/go.sum | 4 ++-- config/confighttp/go.mod | 2 +- config/confighttp/go.sum | 4 ++-- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- extension/zpagesextension/go.mod | 4 ++-- extension/zpagesextension/go.sum | 8 ++++---- internal/e2e/go.mod | 4 ++-- internal/e2e/go.sum | 8 ++++---- otelcol/go.mod | 2 +- otelcol/go.sum | 12 ++++++------ otelcol/otelcoltest/go.mod | 2 +- otelcol/otelcoltest/go.sum | 12 ++++++------ receiver/otlpreceiver/go.mod | 4 ++-- receiver/otlpreceiver/go.sum | 8 ++++---- service/go.mod | 6 +++--- service/go.sum | 12 ++++++------ 22 files changed, 65 insertions(+), 65 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 7e3bf8cd4b4..47f5780f0db 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -99,10 +99,10 @@ require ( go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/collector/service v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect - go.opentelemetry.io/contrib/zpages v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect + go.opentelemetry.io/contrib/zpages v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index b7bc898b227..75ee3b45aa8 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -147,14 +147,14 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= -go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= -go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= -go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/contrib/propagators/b3 v1.28.0 h1:XR6CFQrQ/ttAYmTBX2loUEFGdk1h17pxYI8828dk/1Y= +go.opentelemetry.io/contrib/propagators/b3 v1.28.0/go.mod h1:DWRkzJONLquRz7OJPh2rRbZ7MugQj62rk7g6HRnEqh0= +go.opentelemetry.io/contrib/zpages v0.53.0 h1:hGgaJ3nrescxEk383gOBHA5gNfoquHs8oV/XcKYxJkw= +go.opentelemetry.io/contrib/zpages v0.53.0/go.mod h1:iOo8fpUxMAu5+4x9DSEQeUOCeY19KaN6v2OPSeIggz4= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index a0b2a056a80..7859432fede 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -18,7 +18,7 @@ require ( go.opentelemetry.io/collector/featuregate v1.11.0 go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/collector/pdata/testdata v0.104.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 go.opentelemetry.io/otel v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index 929534b788a..b06016e5d24 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -72,8 +72,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 6e3bfee3a17..cbe7ad6fbcf 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/config/internal v0.104.0 go.opentelemetry.io/collector/extension/auth v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 go.opentelemetry.io/otel v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index 5ad218bdf0b..f8c5a45d05e 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -69,8 +69,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index b2927ad5564..0f8553aaeab 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -64,7 +64,7 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 112a1aca9a5..ed504b07109 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -78,8 +78,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 4ee52567c71..e26fcc6ef95 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -62,7 +62,7 @@ require ( go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 37be6821d60..9c716b1f949 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -80,8 +80,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index ec8891431b4..7752fc33ed9 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -10,7 +10,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.104.0 go.opentelemetry.io/collector/confmap v0.104.0 go.opentelemetry.io/collector/extension v0.104.0 - go.opentelemetry.io/contrib/zpages v0.52.0 + go.opentelemetry.io/contrib/zpages v0.53.0 go.opentelemetry.io/otel/sdk v1.28.0 go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/goleak v1.3.0 @@ -55,7 +55,7 @@ require ( go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index 8e42884cef3..4e60e9b8a3c 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -75,10 +75,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= -go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/contrib/zpages v0.53.0 h1:hGgaJ3nrescxEk383gOBHA5gNfoquHs8oV/XcKYxJkw= +go.opentelemetry.io/contrib/zpages v0.53.0/go.mod h1:iOo8fpUxMAu5+4x9DSEQeUOCeY19KaN6v2OPSeIggz4= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 5d39e5fb1e0..4ad17bbdc04 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -66,8 +66,8 @@ require ( go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 8af7284e171..3723860902b 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -82,10 +82,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= diff --git a/otelcol/go.mod b/otelcol/go.mod index 145c7fec44a..10e80bbb6b0 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -70,7 +70,7 @@ require ( go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index 55ea165d93d..56e1c3f5140 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -145,12 +145,12 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= -go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= -go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= -go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/contrib/propagators/b3 v1.28.0 h1:XR6CFQrQ/ttAYmTBX2loUEFGdk1h17pxYI8828dk/1Y= +go.opentelemetry.io/contrib/propagators/b3 v1.28.0/go.mod h1:DWRkzJONLquRz7OJPh2rRbZ7MugQj62rk7g6HRnEqh0= +go.opentelemetry.io/contrib/zpages v0.53.0 h1:hGgaJ3nrescxEk383gOBHA5gNfoquHs8oV/XcKYxJkw= +go.opentelemetry.io/contrib/zpages v0.53.0/go.mod h1:iOo8fpUxMAu5+4x9DSEQeUOCeY19KaN6v2OPSeIggz4= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 7a03a4e85ca..f806c27d641 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -70,7 +70,7 @@ require ( go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum index 55ea165d93d..56e1c3f5140 100644 --- a/otelcol/otelcoltest/go.sum +++ b/otelcol/otelcoltest/go.sum @@ -145,12 +145,12 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= -go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= -go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= -go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/contrib/propagators/b3 v1.28.0 h1:XR6CFQrQ/ttAYmTBX2loUEFGdk1h17pxYI8828dk/1Y= +go.opentelemetry.io/contrib/propagators/b3 v1.28.0/go.mod h1:DWRkzJONLquRz7OJPh2rRbZ7MugQj62rk7g6HRnEqh0= +go.opentelemetry.io/contrib/zpages v0.53.0 h1:hGgaJ3nrescxEk383gOBHA5gNfoquHs8oV/XcKYxJkw= +go.opentelemetry.io/contrib/zpages v0.53.0/go.mod h1:iOo8fpUxMAu5+4x9DSEQeUOCeY19KaN6v2OPSeIggz4= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index ae4d23d5e56..07b6c1332a4 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -65,8 +65,8 @@ require ( go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 8af7284e171..3723860902b 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -82,10 +82,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= diff --git a/service/go.mod b/service/go.mod index da95dfe06ae..79e6807cc7a 100644 --- a/service/go.mod +++ b/service/go.mod @@ -27,7 +27,7 @@ require ( go.opentelemetry.io/collector/receiver v0.104.0 go.opentelemetry.io/collector/semconv v0.104.0 go.opentelemetry.io/contrib/config v0.8.0 - go.opentelemetry.io/contrib/propagators/b3 v1.27.0 + go.opentelemetry.io/contrib/propagators/b3 v1.28.0 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/bridge/opencensus v1.28.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 @@ -87,8 +87,8 @@ require ( go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect - go.opentelemetry.io/contrib/zpages v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect + go.opentelemetry.io/contrib/zpages v0.53.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect diff --git a/service/go.sum b/service/go.sum index 2a9dedcf58e..9d4e9209ab2 100644 --- a/service/go.sum +++ b/service/go.sum @@ -137,12 +137,12 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/contrib/propagators/b3 v1.27.0 h1:IjgxbomVrV9za6bRi8fWCNXENs0co37SZedQilP2hm0= -go.opentelemetry.io/contrib/propagators/b3 v1.27.0/go.mod h1:Dv9obQz25lCisDvvs4dy28UPh974CxkahRDUPsY7y9E= -go.opentelemetry.io/contrib/zpages v0.52.0 h1:MPgkMy0Cp3O5EdfVXP0ss3ujhEibysTM4eszx7E7d+E= -go.opentelemetry.io/contrib/zpages v0.52.0/go.mod h1:fqG5AFdoYru3A3DnhibVuaaEfQV2WKxE7fYE1jgDRwk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/contrib/propagators/b3 v1.28.0 h1:XR6CFQrQ/ttAYmTBX2loUEFGdk1h17pxYI8828dk/1Y= +go.opentelemetry.io/contrib/propagators/b3 v1.28.0/go.mod h1:DWRkzJONLquRz7OJPh2rRbZ7MugQj62rk7g6HRnEqh0= +go.opentelemetry.io/contrib/zpages v0.53.0 h1:hGgaJ3nrescxEk383gOBHA5gNfoquHs8oV/XcKYxJkw= +go.opentelemetry.io/contrib/zpages v0.53.0/go.mod h1:iOo8fpUxMAu5+4x9DSEQeUOCeY19KaN6v2OPSeIggz4= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= From c0b606349aa8d60ee73451e071e256e822c0d18f Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 9 Jul 2024 10:02:50 +0200 Subject: [PATCH 148/168] [chore] Update the Collector target audiences (#10539) #### Description Reworks 'Target audiences' section to: 1. Reflect the three audiences we have today, distinguishing between component developers and Collector library users 2. Reflect that we encourage end-users to use the OpenTelemetry Collector Builder and that builder compatibility should be a concern when thinking about binary end-users #### Link to tracking issue Relates to #10004 --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Co-authored-by: Yang Song --- CONTRIBUTING.md | 56 ++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8ff893ef042..513ec84462d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,33 +5,45 @@ meeting](https://github.com/open-telemetry/community#special-interest-groups). ## Target audiences -The OpenTelemetry Collector has two main target audiences: +The OpenTelemetry Collector has three main target audiences: -1. End-users, aiming to use an OpenTelemetry Collector binary. -1. Collector distributions, consuming the APIs exposed by the OpenTelemetry core repository. Distributions can be an -official OpenTelemetry community project, such as the OpenTelemetry Collector "core" and "contrib", or external -distributions, such as other open-source projects building on top of the Collector or vendor-specific distributions. +1. *End-users*, aiming to use an OpenTelemetry Collector binary. +1. *Component developers*, consuming the Go APIs to create components compatible with the OpenTelemetry Collector Builder. +1. *Collector library users*, consuming other Go APIs exposed by the opentelemetry-collector repository, for example to + build custom distributions or other projects building on top of the Collector Go APIs. + +When the needs of these audiences conflict, end-users should be prioritized, followed by component developers, and +finally Collector library users. ### End-users End-users are the target audience for our binary distributions, as made available via the -[opentelemetry-collector-releases](https://github.com/open-telemetry/opentelemetry-collector-releases) repository. To -them, stability in the behavior is important, be it runtime or configuration. They are more numerous and harder to get -in touch with, making our changes to the collector more disruptive to them than to other audiences. As a general rule, -whenever you are developing OpenTelemetry Collector components (extensions, receivers, processors, exporters), you -should have end-users' interests in mind. Similarly, changes to code within packages like `config` will have an impact -on this audience. Make sure to cause minimal disruption when doing changes here. - -### Collector distributions - -In this capacity, the opentelemetry-collector repository's public Go types, functions, and interfaces act as an API for -other projects. In addition to the end-user aspect mentioned above, this audience also cares about API compatibility, -making them susceptible to our refactorings, even though such changes wouldn't cause any impact to end-users. See the -"Breaking changes" in this document for more information on how to perform changes affecting this audience. - -This audience might use tools like the -[opentelemetry-collector-builder](https://github.com/open-telemetry/opentelemetry-collector/tree/main/cmd/builder) as -part of their delivery pipeline. Be mindful that changes there might cause disruption to this audience. +[opentelemetry-collector-releases](https://github.com/open-telemetry/opentelemetry-collector-releases) repository, as +well as distributions created using the [OpenTelemetry Collector +Builder](https://github.com/open-telemetry/opentelemetry-collector/tree/main/cmd/builder). To them, stability in the +behavior is important, be it runtime, configuration or [internal +telemetry](https://opentelemetry.io/docs/collector/internal-telemetry/). They are more numerous and harder to get in +touch with, making our changes to the Collector more disruptive to them than to other audiences. As a general rule, +whenever you are developing OpenTelemetry Collector components (extensions, receivers, processors, exporters, +connectors), you should have end-users' interests in mind. Similarly, changes to code within packages like `config` will +have an impact on this audience. Make sure to cause minimal disruption when doing changes here. + +### Component developers + +Component developers create new extensions, receivers, processors, exporters and connectors to be used with the +OpenTelemetry Collector. They are the primary audience for the opentelemetry-collector repository's public Go API. A +significant part of them will contribute to opentelemetry-collector-contrib. In addition to the end-user aspect +mentioned above, this audience also cares about Go API compatibility of Go modules such as the ones in the `pdata`, +`component`, `consumer`, `confmap`, `exporterhelper`, `config*` modules and others, even though such changes wouldn't cause any +impact to end-users. See the [Breaking changes](#breaking-changes) in this document for more information on how to perform changes +affecting this audience. + +### Collector library users + +A third audience uses the OpenTelemetry Collector as a library to build their own distributions or other projects based +on the Collector. This audience is the main consumer of modules such as `service` or `otelcol`. They also share the same +concerns as component developers regarding Go API compatibility, and are also interested in behavior stability. These +are our most advanced users and are the most equipped to deal with disruptive changes. ## How to structure PRs to get expedient reviews? From 9d990b901121788eba1a15e4bf2a667e53f61bfa Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 9 Jul 2024 10:03:15 +0200 Subject: [PATCH 149/168] [chore][confmap] Add string representation to mocked env provider (#10559) #### Description Adds string representation to all inputs returned by mock env provider used in tests. The real `env` provider (and all other providers on this repository) do this by default since they use `NewRetrievedFromYAML`. Note that certain types are not really obtainable with the real `env` provider (e.g. `int32` or `float64`). I have kept them and added the string representation manually. #### Link to tracking issue Needed for #10554 Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- confmap/expand_test.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/confmap/expand_test.go b/confmap/expand_test.go index b7bfc59483d..9cca35c7008 100644 --- a/confmap/expand_test.go +++ b/confmap/expand_test.go @@ -414,27 +414,27 @@ func newEnvProvider() ProviderFactory { } switch uri { case "env:COMPLEX_VALUE": - return NewRetrieved([]any{"localhost:3042"}) + return NewRetrievedFromYAML([]byte("[localhost:3042]")) case "env:HOST": - return NewRetrieved("localhost") + return NewRetrievedFromYAML([]byte("localhost")) case "env:OS": - return NewRetrieved("ubuntu") + return NewRetrievedFromYAML([]byte("ubuntu")) case "env:PR": - return NewRetrieved("amd") + return NewRetrievedFromYAML([]byte("amd")) case "env:PORT": - return NewRetrieved(3044) + return NewRetrievedFromYAML([]byte("3044")) case "env:INT": - return NewRetrieved(1) + return NewRetrievedFromYAML([]byte("1")) case "env:INT32": - return NewRetrieved(32) + return NewRetrieved(int32(32), withStringRepresentation("32")) case "env:INT64": - return NewRetrieved(64) + return NewRetrieved(int64(64), withStringRepresentation("64")) case "env:FLOAT32": - return NewRetrieved(float32(3.25)) + return NewRetrieved(float32(3.25), withStringRepresentation("3.25")) case "env:FLOAT64": - return NewRetrieved(float64(6.4)) + return NewRetrieved(float64(6.4), withStringRepresentation("6.4")) case "env:BOOL": - return NewRetrieved(true) + return NewRetrievedFromYAML([]byte("true")) } return nil, errors.New("impossible") }) From e7ce1d50fb5e33deb66fdd7912ef747c2bcfd3b6 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 9 Jul 2024 11:31:54 +0200 Subject: [PATCH 150/168] [otelcol] Add hint about `confmap.strictlyTypedInput` feature gate (#10553) #### Description Adds coda to errors related to `confmap.strictlyTypedInput` that direct users to #10552 and explain the feature gate. #### Link to tracking issue Updates #9532 #### Testing Tests that the coda is present when there are weakly typed errors and not present with non weakly-typed errors. --- .chloggen/mx-psi_clearer-error-message.yaml | 25 +++++++ otelcol/configprovider.go | 29 +++++++- otelcol/configprovider_test.go | 74 +++++++++++++++++++ .../weak-empty-map-to-empty-array.yaml | 33 +++++++++ .../testdata/weak-implicit-bool-to-int.yaml | 36 +++++++++ .../weak-implicit-bool-to-string.yaml | 33 +++++++++ .../testdata/weak-implicit-int-to-bool.yaml | 36 +++++++++ .../testdata/weak-implicit-int-to-string.yaml | 33 +++++++++ .../weak-implicit-string-to-bool.yaml | 36 +++++++++ .../testdata/weak-implicit-string-to-int.yaml | 36 +++++++++ .../weak-single-element-to-slice.yaml | 33 +++++++++ .../testdata/weak-slice-of-maps-to-map.yaml | 33 +++++++++ 12 files changed, 436 insertions(+), 1 deletion(-) create mode 100644 .chloggen/mx-psi_clearer-error-message.yaml create mode 100644 otelcol/testdata/weak-empty-map-to-empty-array.yaml create mode 100644 otelcol/testdata/weak-implicit-bool-to-int.yaml create mode 100644 otelcol/testdata/weak-implicit-bool-to-string.yaml create mode 100644 otelcol/testdata/weak-implicit-int-to-bool.yaml create mode 100644 otelcol/testdata/weak-implicit-int-to-string.yaml create mode 100644 otelcol/testdata/weak-implicit-string-to-bool.yaml create mode 100644 otelcol/testdata/weak-implicit-string-to-int.yaml create mode 100644 otelcol/testdata/weak-single-element-to-slice.yaml create mode 100644 otelcol/testdata/weak-slice-of-maps-to-map.yaml diff --git a/.chloggen/mx-psi_clearer-error-message.yaml b/.chloggen/mx-psi_clearer-error-message.yaml new file mode 100644 index 00000000000..ad05a92a94f --- /dev/null +++ b/.chloggen/mx-psi_clearer-error-message.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confmap + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add explanation to errors related to `confmap.strictlyTypedInput` feature gate. + +# One or more tracking issues or pull requests related to the change +issues: [9532] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/otelcol/configprovider.go b/otelcol/configprovider.go index ea5ab1b2026..4b003a6fa39 100644 --- a/otelcol/configprovider.go +++ b/otelcol/configprovider.go @@ -6,8 +6,16 @@ package otelcol // import "go.opentelemetry.io/collector/otelcol" import ( "context" "fmt" + "strings" "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/internal/featuregates" +) + +var ( + strictlyTypedMessageCoda = `Hint: Temporarily restore the previous behavior by disabling + the ` + fmt.Sprintf("`%s`", featuregates.StrictlyTypedInputID) + ` feature gate. More details at: + https://github.com/open-telemetry/opentelemetry-collector/issues/10552` ) // ConfigProvider provides the service configuration. @@ -95,7 +103,26 @@ func (cm *configProvider) Get(ctx context.Context, factories Factories) (*Config var cfg *configSettings if cfg, err = unmarshal(conf, factories); err != nil { - return nil, fmt.Errorf("cannot unmarshal the configuration: %w", err) + err = fmt.Errorf("cannot unmarshal the configuration: %w", err) + + if featuregates.StrictlyTypedInputGate.IsEnabled() { + var shouldAddCoda bool + for _, errorStr := range []string{ + "got unconvertible type", // https://github.com/mitchellh/mapstructure/blob/8508981/mapstructure.go#L610 + "source data must be", // https://github.com/mitchellh/mapstructure/blob/8508981/mapstructure.go#L1114 + "expected a map, got 'slice'", // https://github.com/mitchellh/mapstructure/blob/8508981/mapstructure.go#L831 + } { + shouldAddCoda = strings.Contains(err.Error(), errorStr) + if shouldAddCoda { + break + } + } + if shouldAddCoda { + err = fmt.Errorf("%w\n\n%s", err, strictlyTypedMessageCoda) + } + } + + return nil, err } return &Config{ diff --git a/otelcol/configprovider_test.go b/otelcol/configprovider_test.go index 18c97ea1a94..a11bc9b019d 100644 --- a/otelcol/configprovider_test.go +++ b/otelcol/configprovider_test.go @@ -14,6 +14,8 @@ import ( "gopkg.in/yaml.v3" "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/featuregates" ) func newConfig(yamlBytes []byte, factories Factories) (*Config, error) { @@ -137,3 +139,75 @@ func TestGetConfmap(t *testing.T) { assert.EqualValues(t, yamlMap, cmap.ToStringMap()) } + +func TestStrictlyTypedCoda(t *testing.T) { + tests := []struct { + basename string + // isErrFromStrictTypes indicates whether the test should expect an error when the feature gate is + // disabled. If so, we check that it errs both with and without the feature gate and that the coda is never + // present. + isErrFromStrictTypes bool + }{ + {basename: "weak-implicit-bool-to-string.yaml"}, + {basename: "weak-implicit-int-to-string.yaml"}, + {basename: "weak-implicit-bool-to-int.yaml"}, + {basename: "weak-implicit-string-to-int.yaml"}, + {basename: "weak-implicit-int-to-bool.yaml"}, + {basename: "weak-implicit-string-to-bool.yaml"}, + {basename: "weak-empty-map-to-empty-array.yaml"}, + {basename: "weak-slice-of-maps-to-map.yaml"}, + {basename: "weak-single-element-to-slice.yaml"}, + { + basename: "otelcol-invalid-components.yaml", + isErrFromStrictTypes: true, + }, + } + + for _, tt := range tests { + t.Run(tt.basename, func(t *testing.T) { + filename := filepath.Join("testdata", tt.basename) + uriLocation := "file:" + filename + fileProvider := newFakeProvider("file", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { + return confmap.NewRetrieved(newConfFromFile(t, filename)) + }) + cp, err := NewConfigProvider(ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + URIs: []string{uriLocation}, + ProviderFactories: []confmap.ProviderFactory{fileProvider}, + }, + }) + require.NoError(t, err) + factories, err := nopFactories() + require.NoError(t, err) + + // Save the previous value of the feature gate and restore it after the test. + prev := featuregates.StrictlyTypedInputGate.IsEnabled() + defer func() { + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, prev)) + }() + + // Ensure the error does not appear with the feature gate disabled. + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, false)) + _, errWeakTypes := cp.Get(context.Background(), factories) + if tt.isErrFromStrictTypes { + require.Error(t, errWeakTypes) + // Ensure coda is **NOT** present. + assert.NotContains(t, errWeakTypes.Error(), strictlyTypedMessageCoda) + } else { + require.NoError(t, errWeakTypes) + } + + // Test with the feature gate enabled. + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, true)) + _, errStrictTypes := cp.Get(context.Background(), factories) + require.Error(t, errStrictTypes) + if tt.isErrFromStrictTypes { + // Ensure coda is **NOT** present. + assert.NotContains(t, errStrictTypes.Error(), strictlyTypedMessageCoda) + } else { + // Ensure coda is present. + assert.ErrorContains(t, errStrictTypes, strictlyTypedMessageCoda) + } + }) + } +} diff --git a/otelcol/testdata/weak-empty-map-to-empty-array.yaml b/otelcol/testdata/weak-empty-map-to-empty-array.yaml new file mode 100644 index 00000000000..4a272e93ca3 --- /dev/null +++ b/otelcol/testdata/weak-empty-map-to-empty-array.yaml @@ -0,0 +1,33 @@ +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +connectors: + nop/con: + +service: + telemetry: + metrics: + address: localhost:8888 + extensions: [nop] + pipelines: + traces: + receivers: [nop] + processors: {} # <-- Empty map casted to empty array + exporters: [nop, nop/con] + metrics: + receivers: [nop] + processors: [nop] + exporters: [nop] + logs: + receivers: [nop, nop/con] + processors: [nop] + exporters: [nop] diff --git a/otelcol/testdata/weak-implicit-bool-to-int.yaml b/otelcol/testdata/weak-implicit-bool-to-int.yaml new file mode 100644 index 00000000000..a1e0bdce27f --- /dev/null +++ b/otelcol/testdata/weak-implicit-bool-to-int.yaml @@ -0,0 +1,36 @@ +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +connectors: + nop/con: + +service: + telemetry: + metrics: + address: localhost:8888 + logs: + sampling: + initial: true # <-- Implicit cast bool to int + extensions: [nop] + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [nop, nop/con] + metrics: + receivers: [nop] + processors: [nop] + exporters: [nop] + logs: + receivers: [nop, nop/con] + processors: [nop] + exporters: [nop] diff --git a/otelcol/testdata/weak-implicit-bool-to-string.yaml b/otelcol/testdata/weak-implicit-bool-to-string.yaml new file mode 100644 index 00000000000..d74046baf10 --- /dev/null +++ b/otelcol/testdata/weak-implicit-bool-to-string.yaml @@ -0,0 +1,33 @@ +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +connectors: + nop/con: + +service: + telemetry: + metrics: + address: true # <-- Implicit cast bool to string + extensions: [nop] + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [nop, nop/con] + metrics: + receivers: [nop] + processors: [nop] + exporters: [nop] + logs: + receivers: [nop, nop/con] + processors: [nop] + exporters: [nop] diff --git a/otelcol/testdata/weak-implicit-int-to-bool.yaml b/otelcol/testdata/weak-implicit-int-to-bool.yaml new file mode 100644 index 00000000000..0fec68386c0 --- /dev/null +++ b/otelcol/testdata/weak-implicit-int-to-bool.yaml @@ -0,0 +1,36 @@ +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +connectors: + nop/con: + +service: + telemetry: + metrics: + address: localhost:8888 + logs: + sampling: + enabled: 1 # <-- Implicit cast int to bool + extensions: [nop] + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [nop, nop/con] + metrics: + receivers: [nop] + processors: [nop] + exporters: [nop] + logs: + receivers: [nop, nop/con] + processors: [nop] + exporters: [nop] diff --git a/otelcol/testdata/weak-implicit-int-to-string.yaml b/otelcol/testdata/weak-implicit-int-to-string.yaml new file mode 100644 index 00000000000..78e920f6554 --- /dev/null +++ b/otelcol/testdata/weak-implicit-int-to-string.yaml @@ -0,0 +1,33 @@ +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +connectors: + nop/con: + +service: + telemetry: + metrics: + address: 0xdeadbeef # <-- Implicit cast int to string + extensions: [nop] + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [nop, nop/con] + metrics: + receivers: [nop] + processors: [nop] + exporters: [nop] + logs: + receivers: [nop, nop/con] + processors: [nop] + exporters: [nop] diff --git a/otelcol/testdata/weak-implicit-string-to-bool.yaml b/otelcol/testdata/weak-implicit-string-to-bool.yaml new file mode 100644 index 00000000000..7a4f578e761 --- /dev/null +++ b/otelcol/testdata/weak-implicit-string-to-bool.yaml @@ -0,0 +1,36 @@ +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +connectors: + nop/con: + +service: + telemetry: + metrics: + address: localhost:8888 + logs: + sampling: + enabled: t # <-- Implicit cast string to bool + extensions: [nop] + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [nop, nop/con] + metrics: + receivers: [nop] + processors: [nop] + exporters: [nop] + logs: + receivers: [nop, nop/con] + processors: [nop] + exporters: [nop] diff --git a/otelcol/testdata/weak-implicit-string-to-int.yaml b/otelcol/testdata/weak-implicit-string-to-int.yaml new file mode 100644 index 00000000000..d22178a84bf --- /dev/null +++ b/otelcol/testdata/weak-implicit-string-to-int.yaml @@ -0,0 +1,36 @@ +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +connectors: + nop/con: + +service: + telemetry: + metrics: + address: localhost:8888 + logs: + sampling: + initial: "100" # <-- Implicit cast string to int + extensions: [nop] + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [nop, nop/con] + metrics: + receivers: [nop] + processors: [nop] + exporters: [nop] + logs: + receivers: [nop, nop/con] + processors: [nop] + exporters: [nop] diff --git a/otelcol/testdata/weak-single-element-to-slice.yaml b/otelcol/testdata/weak-single-element-to-slice.yaml new file mode 100644 index 00000000000..8ce29a01248 --- /dev/null +++ b/otelcol/testdata/weak-single-element-to-slice.yaml @@ -0,0 +1,33 @@ +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +connectors: + nop/con: + +service: + telemetry: + metrics: + address: localhost:8888 + extensions: nop # <-- Single element casted to slice + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [nop, nop/con] + metrics: + receivers: [nop] + processors: [nop] + exporters: [nop] + logs: + receivers: [nop, nop/con] + processors: [nop] + exporters: [nop] diff --git a/otelcol/testdata/weak-slice-of-maps-to-map.yaml b/otelcol/testdata/weak-slice-of-maps-to-map.yaml new file mode 100644 index 00000000000..2b3aeb2e11e --- /dev/null +++ b/otelcol/testdata/weak-slice-of-maps-to-map.yaml @@ -0,0 +1,33 @@ +receivers: + nop: + +processors: + nop: + +exporters: + nop: + +extensions: + nop: + +connectors: + nop/con: + +service: + telemetry: + metrics: + address: localhost:8888 + extensions: [nop] + pipelines: + - traces: # <-- Slice of maps casted to map + receivers: [nop] + processors: [nop] + exporters: [nop, nop/con] + metrics: + receivers: [nop] + processors: [nop] + exporters: [nop] + - logs: + receivers: [nop, nop/con] + processors: [nop] + exporters: [nop] From a63ef72597f3a2ab63c71671f77ee87e18486650 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 06:10:17 -0700 Subject: [PATCH 151/168] fix(deps): update all golang.org/x packages (#10564) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | golang.org/x/mod | `v0.18.0` -> `v0.19.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2fmod/v0.19.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2fmod/v0.19.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2fmod/v0.18.0/v0.19.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2fmod/v0.18.0/v0.19.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | golang.org/x/net | `v0.26.0` -> `v0.27.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2fnet/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2fnet/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2fnet/v0.26.0/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2fnet/v0.26.0/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | golang.org/x/sys | `v0.21.0` -> `v0.22.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2fsys/v0.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2fsys/v0.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2fsys/v0.21.0/v0.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2fsys/v0.21.0/v0.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | golang.org/x/tools | `v0.22.0` -> `v0.23.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2ftools/v0.23.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2ftools/v0.23.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2ftools/v0.22.0/v0.23.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2ftools/v0.22.0/v0.23.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/builder/go.mod | 2 +- cmd/builder/go.sum | 4 ++-- cmd/otelcorecol/go.mod | 4 ++-- cmd/otelcorecol/go.sum | 8 ++++---- config/confighttp/go.mod | 4 ++-- config/confighttp/go.sum | 8 ++++---- exporter/debugexporter/go.mod | 2 +- exporter/debugexporter/go.sum | 4 ++-- exporter/go.mod | 2 +- exporter/go.sum | 4 ++-- exporter/loggingexporter/go.mod | 2 +- exporter/loggingexporter/go.sum | 4 ++-- exporter/nopexporter/go.mod | 2 +- exporter/nopexporter/go.sum | 4 ++-- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 4 ++-- exporter/otlphttpexporter/go.sum | 8 ++++---- extension/zpagesextension/go.mod | 4 ++-- extension/zpagesextension/go.sum | 8 ++++---- internal/e2e/go.mod | 4 ++-- internal/e2e/go.sum | 8 ++++---- internal/tools/go.mod | 10 +++++----- internal/tools/go.sum | 24 ++++++++++++------------ otelcol/go.mod | 4 ++-- otelcol/go.sum | 8 ++++---- otelcol/otelcoltest/go.mod | 4 ++-- otelcol/otelcoltest/go.sum | 8 ++++---- receiver/otlpreceiver/go.mod | 4 ++-- receiver/otlpreceiver/go.sum | 8 ++++---- service/go.mod | 4 ++-- service/go.sum | 8 ++++---- 32 files changed, 89 insertions(+), 89 deletions(-) diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod index df6ce76a4f0..d18b16f9143 100644 --- a/cmd/builder/go.mod +++ b/cmd/builder/go.mod @@ -18,7 +18,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/mod v0.18.0 + golang.org/x/mod v0.19.0 ) require ( diff --git a/cmd/builder/go.sum b/cmd/builder/go.sum index 175d6a59cf1..615e9240b56 100644 --- a/cmd/builder/go.sum +++ b/cmd/builder/go.sum @@ -52,8 +52,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 47f5780f0db..8593d01a505 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -34,7 +34,7 @@ require ( go.opentelemetry.io/collector/receiver v0.104.0 go.opentelemetry.io/collector/receiver/nopreceiver v0.104.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.0 - golang.org/x/sys v0.21.0 + golang.org/x/sys v0.22.0 ) require ( @@ -124,7 +124,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 75ee3b45aa8..8ff45ea51ee 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -217,8 +217,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -233,8 +233,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index cbe7ad6fbcf..16fca9ec7dc 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -21,7 +21,7 @@ require ( go.opentelemetry.io/otel v1.28.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - golang.org/x/net v0.26.0 + golang.org/x/net v0.27.0 ) require ( @@ -57,7 +57,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index f8c5a45d05e..496d81d7e03 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -98,16 +98,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 34b8685d220..f9f2210a0f7 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -55,7 +55,7 @@ require ( go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index 9c1f0e7c31d..5e520f738d0 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -101,8 +101,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/exporter/go.mod b/exporter/go.mod index 2d3d81590c6..372739bfa50 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -23,7 +23,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/sys v0.21.0 + golang.org/x/sys v0.22.0 google.golang.org/grpc v1.65.0 ) diff --git a/exporter/go.sum b/exporter/go.sum index 9c1f0e7c31d..5e520f738d0 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -101,8 +101,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 720e3ffc97f..52b5f8adbaa 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -54,7 +54,7 @@ require ( go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 9c1f0e7c31d..5e520f738d0 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -101,8 +101,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index aa61e4bc524..1dfb5a09d1b 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -49,7 +49,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index 9c1f0e7c31d..5e520f738d0 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -101,8 +101,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 0f8553aaeab..e151f9d9c8b 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -84,7 +84,7 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index ed504b07109..6ccfbad0c30 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -137,8 +137,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index e26fcc6ef95..5d9b30ecfba 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -81,8 +81,8 @@ require ( go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 9c716b1f949..86e0b52b698 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -131,16 +131,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 7752fc33ed9..4e5279b4f19 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -72,8 +72,8 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index 4e60e9b8a3c..e9da2a98a1c 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -128,16 +128,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 4ad17bbdc04..9dc8e3ed0ae 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -87,8 +87,8 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index 3723860902b..f055ea0898d 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -135,16 +135,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 85ccda0bd6b..32c6a7e56e7 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -15,7 +15,7 @@ require ( go.opentelemetry.io/build-tools/multimod v0.13.0 go.opentelemetry.io/build-tools/semconvgen v0.13.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 - golang.org/x/tools v0.22.0 + golang.org/x/tools v0.23.0 golang.org/x/vuln v1.1.2 ) @@ -204,12 +204,12 @@ require ( go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.24.0 // indirect + golang.org/x/crypto v0.25.0 // indirect golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect - golang.org/x/mod v0.18.0 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/mod v0.19.0 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index f328b85ea81..b4dbadb49e0 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -499,8 +499,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= @@ -517,8 +517,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -535,8 +535,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -571,8 +571,8 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 h1:FemxDzfMUcK2f3YY4H+05K9CDzbSVr2+q/JKN45pey0= golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -582,8 +582,8 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -618,8 +618,8 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= +golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/vuln v1.1.2 h1:UkLxe+kAMcrNBpGrFbU0Mc5l7cX97P2nhy21wx5+Qbk= golang.org/x/vuln v1.1.2/go.mod h1:2o3fRKD8Uz9AraAL3lwd/grWBv+t+SeJnPcqBUJrY24= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/otelcol/go.mod b/otelcol/go.mod index 10e80bbb6b0..1eadf69a1ee 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -20,7 +20,7 @@ require ( go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 - golang.org/x/sys v0.21.0 + golang.org/x/sys v0.22.0 google.golang.org/grpc v1.65.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -89,7 +89,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index 56e1c3f5140..756c3a8cda6 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -213,8 +213,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -229,8 +229,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index f806c27d641..9eda55d4950 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -92,8 +92,8 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum index 56e1c3f5140..756c3a8cda6 100644 --- a/otelcol/otelcoltest/go.sum +++ b/otelcol/otelcoltest/go.sum @@ -213,8 +213,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -229,8 +229,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 07b6c1332a4..9cf97c63c43 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -85,8 +85,8 @@ require ( go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 3723860902b..f055ea0898d 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -135,16 +135,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= diff --git a/service/go.mod b/service/go.mod index 79e6807cc7a..908185063fd 100644 --- a/service/go.mod +++ b/service/go.mod @@ -97,8 +97,8 @@ require ( go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect diff --git a/service/go.sum b/service/go.sum index 9d4e9209ab2..189aa4892e6 100644 --- a/service/go.sum +++ b/service/go.sum @@ -205,8 +205,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -221,8 +221,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= From b9570b4fe643777e21a9d8a1c5913af63efe36db Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 06:10:31 -0700 Subject: [PATCH 152/168] chore(deps): update actions/upload-artifact action to v4.3.4 (#10563) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/upload-artifact](https://togithub.com/actions/upload-artifact) | action | patch | `v4.3.3` -> `v4.3.4` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
actions/upload-artifact (actions/upload-artifact) ### [`v4.3.4`](https://togithub.com/actions/upload-artifact/releases/tag/v4.3.4) [Compare Source](https://togithub.com/actions/upload-artifact/compare/v4.3.3...v4.3.4) ##### What's Changed - Update [@​actions/artifact](https://togithub.com/actions/artifact) version, bump dependencies by [@​robherley](https://togithub.com/robherley) in [https://github.com/actions/upload-artifact/pull/584](https://togithub.com/actions/upload-artifact/pull/584) **Full Changelog**: https://github.com/actions/upload-artifact/compare/v4.3.3...v4.3.4
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index b05abb49294..ee382cd1823 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -56,7 +56,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 with: name: SARIF file path: results.sarif From d37fe6ccb74a24f141ee8ea5397a3a012d8a8600 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Tue, 9 Jul 2024 18:13:54 +0200 Subject: [PATCH 153/168] Add consumer profiles (#10464) #### Description This adds profiles support for consumers. #### Link to tracking issue Based on the discussion in #10375. --------- Co-authored-by: Pablo Baeyens --- .chloggen/profile-consumer.yaml | 25 +++++++ consumer/consumer.go | 42 ++---------- consumer/consumerprofiles/Makefile | 1 + consumer/consumerprofiles/go.mod | 35 ++++++++++ consumer/consumerprofiles/go.sum | 77 ++++++++++++++++++++++ consumer/consumerprofiles/profiles.go | 47 +++++++++++++ consumer/consumerprofiles/profiles_test.go | 51 ++++++++++++++ consumer/internal/consumer.go | 42 ++++++++++++ consumer/logs.go | 7 +- consumer/metrics.go | 7 +- consumer/traces.go | 7 +- versions.yaml | 1 + 12 files changed, 297 insertions(+), 45 deletions(-) create mode 100644 .chloggen/profile-consumer.yaml create mode 100644 consumer/consumerprofiles/Makefile create mode 100644 consumer/consumerprofiles/go.mod create mode 100644 consumer/consumerprofiles/go.sum create mode 100644 consumer/consumerprofiles/profiles.go create mode 100644 consumer/consumerprofiles/profiles_test.go create mode 100644 consumer/internal/consumer.go diff --git a/.chloggen/profile-consumer.yaml b/.chloggen/profile-consumer.yaml new file mode 100644 index 00000000000..a515f5a7949 --- /dev/null +++ b/.chloggen/profile-consumer.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: new_component + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: consumer/consumerprofiles + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Allow handling profiles in consumer. + +# One or more tracking issues or pull requests related to the change +issues: [10464] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/consumer/consumer.go b/consumer/consumer.go index 503750ad7cb..64076655f20 100644 --- a/consumer/consumer.go +++ b/consumer/consumer.go @@ -5,52 +5,22 @@ package consumer // import "go.opentelemetry.io/collector/consumer" import ( "errors" + + "go.opentelemetry.io/collector/consumer/internal" ) // Capabilities describes the capabilities of a Processor. -type Capabilities struct { - // MutatesData is set to true if Consume* function of the - // processor modifies the input Traces, Logs or Metrics argument. - // Processors which modify the input data MUST set this flag to true. If the processor - // does not modify the data it MUST set this flag to false. If the processor creates - // a copy of the data before modifying then this flag can be safely set to false. - MutatesData bool -} - -type baseConsumer interface { - Capabilities() Capabilities -} +type Capabilities = internal.Capabilities var errNilFunc = errors.New("nil consumer func") -type baseImpl struct { - capabilities Capabilities -} - // Option to construct new consumers. -type Option func(*baseImpl) +type Option = internal.Option // WithCapabilities overrides the default GetCapabilities function for a processor. // The default GetCapabilities function returns mutable capabilities. func WithCapabilities(capabilities Capabilities) Option { - return func(o *baseImpl) { - o.capabilities = capabilities - } -} - -// Capabilities returns the capabilities of the component -func (bs baseImpl) Capabilities() Capabilities { - return bs.capabilities -} - -func newBaseImpl(options ...Option) *baseImpl { - bs := &baseImpl{ - capabilities: Capabilities{MutatesData: false}, + return func(o *internal.BaseImpl) { + o.Cap = capabilities } - - for _, op := range options { - op(bs) - } - - return bs } diff --git a/consumer/consumerprofiles/Makefile b/consumer/consumerprofiles/Makefile new file mode 100644 index 00000000000..ded7a36092d --- /dev/null +++ b/consumer/consumerprofiles/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/consumer/consumerprofiles/go.mod b/consumer/consumerprofiles/go.mod new file mode 100644 index 00000000000..7b0a06cb098 --- /dev/null +++ b/consumer/consumerprofiles/go.mod @@ -0,0 +1,35 @@ +module go.opentelemetry.io/collector/consumer/consumerprofiles + +go 1.21.0 + +replace go.opentelemetry.io/collector/pdata => ../../pdata + +replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + +replace go.opentelemetry.io/collector/consumer => ../ + +require ( + github.com/stretchr/testify v1.9.0 + go.opentelemetry.io/collector/consumer v0.104.0 + go.opentelemetry.io/collector/pdata/pprofile v0.104.0 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/json-iterator/go v1.1.12 // indirect + 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/pdata v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/grpc v1.65.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata diff --git a/consumer/consumerprofiles/go.sum b/consumer/consumerprofiles/go.sum new file mode 100644 index 00000000000..528166b78c0 --- /dev/null +++ b/consumer/consumerprofiles/go.sum @@ -0,0 +1,77 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +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/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +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/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +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= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/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/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +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= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +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-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +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/consumer/consumerprofiles/profiles.go b/consumer/consumerprofiles/profiles.go new file mode 100644 index 00000000000..7ab6b864dff --- /dev/null +++ b/consumer/consumerprofiles/profiles.go @@ -0,0 +1,47 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package consumerprofiles // import "go.opentelemetry.io/collector/consumer/consumerprofiles" + +import ( + "context" + "errors" + + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/consumer/internal" + "go.opentelemetry.io/collector/pdata/pprofile" +) + +var errNilFunc = errors.New("nil consumer func") + +// Profiles is an interface that receives pprofile.Profiles, processes it +// as needed, and sends it to the next processing node if any or to the destination. +type Profiles interface { + internal.BaseConsumer + // ConsumeProfiles receives pprofile.Profiles for consumption. + ConsumeProfiles(ctx context.Context, td pprofile.Profiles) error +} + +// ConsumeProfilesFunc is a helper function that is similar to ConsumeProfiles. +type ConsumeProfilesFunc func(ctx context.Context, td pprofile.Profiles) error + +// ConsumeProfiles calls f(ctx, td). +func (f ConsumeProfilesFunc) ConsumeProfiles(ctx context.Context, td pprofile.Profiles) error { + return f(ctx, td) +} + +type baseProfiles struct { + *internal.BaseImpl + ConsumeProfilesFunc +} + +// NewProfiles returns a Profiles configured with the provided options. +func NewProfiles(consume ConsumeProfilesFunc, options ...consumer.Option) (Profiles, error) { + if consume == nil { + return nil, errNilFunc + } + return &baseProfiles{ + BaseImpl: internal.NewBaseImpl(options...), + ConsumeProfilesFunc: consume, + }, nil +} diff --git a/consumer/consumerprofiles/profiles_test.go b/consumer/consumerprofiles/profiles_test.go new file mode 100644 index 00000000000..e50866e74da --- /dev/null +++ b/consumer/consumerprofiles/profiles_test.go @@ -0,0 +1,51 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package consumerprofiles + +import ( + "context" + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/pdata/pprofile" +) + +func TestDefaultProfiles(t *testing.T) { + cp, err := NewProfiles(func(context.Context, pprofile.Profiles) error { return nil }) + assert.NoError(t, err) + assert.NoError(t, cp.ConsumeProfiles(context.Background(), pprofile.NewProfiles())) + assert.Equal(t, consumer.Capabilities{MutatesData: false}, cp.Capabilities()) +} + +func TestNilFuncProfiles(t *testing.T) { + _, err := NewProfiles(nil) + assert.Equal(t, errNilFunc, err) +} + +func TestWithCapabilitiesProfiles(t *testing.T) { + cp, err := NewProfiles( + func(context.Context, pprofile.Profiles) error { return nil }, + consumer.WithCapabilities(consumer.Capabilities{MutatesData: true})) + assert.NoError(t, err) + assert.NoError(t, cp.ConsumeProfiles(context.Background(), pprofile.NewProfiles())) + assert.Equal(t, consumer.Capabilities{MutatesData: true}, cp.Capabilities()) +} + +func TestConsumeProfiles(t *testing.T) { + consumeCalled := false + cp, err := NewProfiles(func(context.Context, pprofile.Profiles) error { consumeCalled = true; return nil }) + assert.NoError(t, err) + assert.NoError(t, cp.ConsumeProfiles(context.Background(), pprofile.NewProfiles())) + assert.True(t, consumeCalled) +} + +func TestConsumeProfiles_ReturnError(t *testing.T) { + want := errors.New("my_error") + cp, err := NewProfiles(func(context.Context, pprofile.Profiles) error { return want }) + assert.NoError(t, err) + assert.Equal(t, want, cp.ConsumeProfiles(context.Background(), pprofile.NewProfiles())) +} diff --git a/consumer/internal/consumer.go b/consumer/internal/consumer.go new file mode 100644 index 00000000000..1f2b5683b22 --- /dev/null +++ b/consumer/internal/consumer.go @@ -0,0 +1,42 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package internal // import "go.opentelemetry.io/collector/consumer/internal" + +// Capabilities describes the capabilities of a Processor. +type Capabilities struct { + // MutatesData is set to true if Consume* function of the + // processor modifies the input Traces, Logs or Metrics argument. + // Processors which modify the input data MUST set this flag to true. If the processor + // does not modify the data it MUST set this flag to false. If the processor creates + // a copy of the data before modifying then this flag can be safely set to false. + MutatesData bool +} + +type BaseConsumer interface { + Capabilities() Capabilities +} + +type BaseImpl struct { + Cap Capabilities +} + +// Option to construct new consumers. +type Option func(*BaseImpl) + +// Capabilities returns the capabilities of the component +func (bs BaseImpl) Capabilities() Capabilities { + return bs.Cap +} + +func NewBaseImpl(options ...Option) *BaseImpl { + bs := &BaseImpl{ + Cap: Capabilities{MutatesData: false}, + } + + for _, op := range options { + op(bs) + } + + return bs +} diff --git a/consumer/logs.go b/consumer/logs.go index 5bf89a52f7a..15166ef1196 100644 --- a/consumer/logs.go +++ b/consumer/logs.go @@ -6,13 +6,14 @@ package consumer // import "go.opentelemetry.io/collector/consumer" import ( "context" + "go.opentelemetry.io/collector/consumer/internal" "go.opentelemetry.io/collector/pdata/plog" ) // Logs is an interface that receives plog.Logs, processes it // as needed, and sends it to the next processing node if any or to the destination. type Logs interface { - baseConsumer + internal.BaseConsumer // ConsumeLogs receives plog.Logs for consumption. ConsumeLogs(ctx context.Context, ld plog.Logs) error } @@ -26,7 +27,7 @@ func (f ConsumeLogsFunc) ConsumeLogs(ctx context.Context, ld plog.Logs) error { } type baseLogs struct { - *baseImpl + *internal.BaseImpl ConsumeLogsFunc } @@ -36,7 +37,7 @@ func NewLogs(consume ConsumeLogsFunc, options ...Option) (Logs, error) { return nil, errNilFunc } return &baseLogs{ - baseImpl: newBaseImpl(options...), + BaseImpl: internal.NewBaseImpl(options...), ConsumeLogsFunc: consume, }, nil } diff --git a/consumer/metrics.go b/consumer/metrics.go index 50df60f02d0..47897f9363a 100644 --- a/consumer/metrics.go +++ b/consumer/metrics.go @@ -6,13 +6,14 @@ package consumer // import "go.opentelemetry.io/collector/consumer" import ( "context" + "go.opentelemetry.io/collector/consumer/internal" "go.opentelemetry.io/collector/pdata/pmetric" ) // Metrics is an interface that receives pmetric.Metrics, processes it // as needed, and sends it to the next processing node if any or to the destination. type Metrics interface { - baseConsumer + internal.BaseConsumer // ConsumeMetrics receives pmetric.Metrics for consumption. ConsumeMetrics(ctx context.Context, md pmetric.Metrics) error } @@ -26,7 +27,7 @@ func (f ConsumeMetricsFunc) ConsumeMetrics(ctx context.Context, md pmetric.Metri } type baseMetrics struct { - *baseImpl + *internal.BaseImpl ConsumeMetricsFunc } @@ -36,7 +37,7 @@ func NewMetrics(consume ConsumeMetricsFunc, options ...Option) (Metrics, error) return nil, errNilFunc } return &baseMetrics{ - baseImpl: newBaseImpl(options...), + BaseImpl: internal.NewBaseImpl(options...), ConsumeMetricsFunc: consume, }, nil } diff --git a/consumer/traces.go b/consumer/traces.go index 56cebd53b37..60df2d04536 100644 --- a/consumer/traces.go +++ b/consumer/traces.go @@ -6,13 +6,14 @@ package consumer // import "go.opentelemetry.io/collector/consumer" import ( "context" + "go.opentelemetry.io/collector/consumer/internal" "go.opentelemetry.io/collector/pdata/ptrace" ) // Traces is an interface that receives ptrace.Traces, processes it // as needed, and sends it to the next processing node if any or to the destination. type Traces interface { - baseConsumer + internal.BaseConsumer // ConsumeTraces receives ptrace.Traces for consumption. ConsumeTraces(ctx context.Context, td ptrace.Traces) error } @@ -26,7 +27,7 @@ func (f ConsumeTracesFunc) ConsumeTraces(ctx context.Context, td ptrace.Traces) } type baseTraces struct { - *baseImpl + *internal.BaseImpl ConsumeTracesFunc } @@ -36,7 +37,7 @@ func NewTraces(consume ConsumeTracesFunc, options ...Option) (Traces, error) { return nil, errNilFunc } return &baseTraces{ - baseImpl: newBaseImpl(options...), + BaseImpl: internal.NewBaseImpl(options...), ConsumeTracesFunc: consume, }, nil } diff --git a/versions.yaml b/versions.yaml index e22abc194fd..90ecb1250fd 100644 --- a/versions.yaml +++ b/versions.yaml @@ -35,6 +35,7 @@ module-sets: - go.opentelemetry.io/collector/connector - go.opentelemetry.io/collector/connector/forwardconnector - go.opentelemetry.io/collector/consumer + - go.opentelemetry.io/collector/consumer/consumerprofiles - go.opentelemetry.io/collector/exporter - go.opentelemetry.io/collector/exporter/debugexporter - go.opentelemetry.io/collector/exporter/loggingexporter From 650ac0bce389f85f9658b7a64a04fe6a1e4ad521 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 9 Jul 2024 11:45:59 -0700 Subject: [PATCH 154/168] [service] add service.disableOpenCensusBridge gate (#10542) This feature gate allows end users to re-enable the opencensus bridge if there's a need for it. This preceeds #10406 and will be taken out of draft once https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29867 is completed. Related to https://github.com/open-telemetry/opentelemetry-collector/issues/10414 --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- .chloggen/codeboten_census-feature-gate.yaml | 25 ++++++++ internal/featuregates/featuregates.go | 5 ++ service/go.mod | 2 +- service/internal/proctelemetry/config.go | 17 ++++-- service/service.go | 5 ++ service/telemetry_test.go | 60 ++++++++++++++++++-- 6 files changed, 103 insertions(+), 11 deletions(-) create mode 100644 .chloggen/codeboten_census-feature-gate.yaml diff --git a/.chloggen/codeboten_census-feature-gate.yaml b/.chloggen/codeboten_census-feature-gate.yaml new file mode 100644 index 00000000000..a7d16bb14f2 --- /dev/null +++ b/.chloggen/codeboten_census-feature-gate.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: service + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "add `service.disableOpenCensusBridge` feature gate which is enabled by default to remove the dependency on OpenCensus" + +# One or more tracking issues or pull requests related to the change +issues: [10414] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/internal/featuregates/featuregates.go b/internal/featuregates/featuregates.go index 2cf0e081317..66b956de804 100644 --- a/internal/featuregates/featuregates.go +++ b/internal/featuregates/featuregates.go @@ -17,3 +17,8 @@ var StrictlyTypedInputGate = featuregate.GlobalRegistry().MustRegister(StrictlyT featuregate.WithRegisterFromVersion("v0.103.0"), featuregate.WithRegisterDescription("Makes type casting rules during configuration unmarshaling stricter. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details."), ) + +var DisableOpenCensusBridge = featuregate.GlobalRegistry().MustRegister("service.disableOpenCensusBridge", + featuregate.StageBeta, + featuregate.WithRegisterFromVersion("v0.104.0"), + featuregate.WithRegisterDescription("`Disables the OpenCensus bridge meaning any component still using the OpenCensus SDK will no longer be able to produce telemetry.")) diff --git a/service/go.mod b/service/go.mod index 908185063fd..879f7478a3e 100644 --- a/service/go.mod +++ b/service/go.mod @@ -21,6 +21,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 go.opentelemetry.io/collector/extension/zpagesextension v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 go.opentelemetry.io/collector/pdata v1.11.0 go.opentelemetry.io/collector/pdata/testdata v0.104.0 go.opentelemetry.io/collector/processor v0.104.0 @@ -85,7 +86,6 @@ require ( go.opentelemetry.io/collector/config/configtls v0.104.0 // indirect go.opentelemetry.io/collector/config/internal v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect - go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/contrib/zpages v0.53.0 // indirect diff --git a/service/internal/proctelemetry/config.go b/service/internal/proctelemetry/config.go index 1c9ba0b63be..493515f01db 100644 --- a/service/internal/proctelemetry/config.go +++ b/service/internal/proctelemetry/config.go @@ -28,6 +28,7 @@ import ( sdkmetric "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/resource" + "go.opentelemetry.io/collector/internal/featuregates" "go.opentelemetry.io/collector/processor/processorhelper" semconv "go.opentelemetry.io/collector/semconv/v1.18.0" ) @@ -67,8 +68,10 @@ func InitMetricReader(ctx context.Context, reader config.MetricReader, asyncErro return initPullExporter(reader.Pull.Exporter, asyncErrorChannel) } if reader.Periodic != nil { - opts := []sdkmetric.PeriodicReaderOption{ - sdkmetric.WithProducer(opencensus.NewMetricProducer()), + var opts []sdkmetric.PeriodicReaderOption + + if !featuregates.DisableOpenCensusBridge.IsEnabled() { + opts = append(opts, sdkmetric.WithProducer(opencensus.NewMetricProducer())) } if reader.Periodic.Interval != nil { opts = append(opts, sdkmetric.WithInterval(time.Duration(*reader.Periodic.Interval)*time.Millisecond)) @@ -160,18 +163,22 @@ func initPrometheusExporter(prometheusConfig *config.Prometheus, asyncErrorChann if prometheusConfig.Port == nil { return nil, nil, fmt.Errorf("port must be specified") } - exporter, err := otelprom.New( + + opts := []otelprom.Option{ otelprom.WithRegisterer(promRegistry), // https://github.com/open-telemetry/opentelemetry-collector/issues/8043 otelprom.WithoutUnits(), // Disabled for the moment until this becomes stable, and we are ready to break backwards compatibility. otelprom.WithoutScopeInfo(), - otelprom.WithProducer(opencensus.NewMetricProducer()), // This allows us to produce metrics that are backwards compatible w/ opencensus otelprom.WithoutCounterSuffixes(), otelprom.WithNamespace("otelcol"), otelprom.WithResourceAsConstantLabels(attribute.NewDenyKeysFilter()), - ) + } + if !featuregates.DisableOpenCensusBridge.IsEnabled() { + opts = append(opts, otelprom.WithProducer(opencensus.NewMetricProducer())) + } + exporter, err := otelprom.New(opts...) if err != nil { return nil, nil, fmt.Errorf("error creating otel prometheus exporter: %w", err) } diff --git a/service/service.go b/service/service.go index 775aa7d7238..f160335d83f 100644 --- a/service/service.go +++ b/service/service.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/extension" + "go.opentelemetry.io/collector/internal/featuregates" "go.opentelemetry.io/collector/internal/localhostgate" "go.opentelemetry.io/collector/internal/obsreportconfig" "go.opentelemetry.io/collector/pdata/pcommon" @@ -113,6 +114,10 @@ func New(ctx context.Context, set Settings, cfg Config) (*Service, error) { } logger.Info("Setting up own telemetry...") + + if featuregates.DisableOpenCensusBridge.IsEnabled() { + logger.Info("OpenCensus bridge is disabled for Collector telemetry and will be removed in a future version, use --feature-gates=-service.disableOpenCensusBridge to re-enable") + } mp, err := newMeterProvider( meterProviderSettings{ res: res, diff --git a/service/telemetry_test.go b/service/telemetry_test.go index 2377a077052..cb89f244a59 100644 --- a/service/telemetry_test.go +++ b/service/telemetry_test.go @@ -19,6 +19,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtelemetry" + "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/featuregates" "go.opentelemetry.io/collector/internal/testutil" semconv "go.opentelemetry.io/collector/semconv/v1.18.0" "go.opentelemetry.io/collector/service/internal/proctelemetry" @@ -42,11 +44,12 @@ func TestTelemetryInit(t *testing.T) { } for _, tc := range []struct { - name string - disableHighCard bool - expectedMetrics map[string]metricValue - extendedConfig bool - cfg *telemetry.Config + name string + disableHighCard bool + disableCensusBridge bool + expectedMetrics map[string]metricValue + extendedConfig bool + cfg *telemetry.Config }{ { name: "UseOpenTelemetryForInternalMetrics", @@ -214,8 +217,55 @@ func TestTelemetryInit(t *testing.T) { }, }, }, + { + name: "DisableOpenCensusBridge", + expectedMetrics: map[string]metricValue{ + metricPrefix + otelPrefix + counterName: { + value: 13, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, + }, + metricPrefix + grpcPrefix + counterName: { + value: 11, + labels: map[string]string{ + "net_sock_peer_addr": "", + "net_sock_peer_name": "", + "net_sock_peer_port": "", + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, + }, + metricPrefix + httpPrefix + counterName: { + value: 10, + labels: map[string]string{ + "net_host_name": "", + "net_host_port": "", + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, + }, + "target_info": { + value: 0, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, + }, + }, + disableCensusBridge: true, + }, } { t.Run(tc.name, func(t *testing.T) { + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.DisableOpenCensusBridge.ID(), tc.disableCensusBridge)) + t.Cleanup(func() { + require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.DisableOpenCensusBridge.ID(), true)) + }) if tc.extendedConfig { tc.cfg.Metrics.Readers = []config.MetricReader{ { From 58b249671610214c07589a2c8d43073fe496b53a Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:57:37 -0700 Subject: [PATCH 155/168] [chore] fix register from version for gate (#10573) This will be released in v0.105 Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- internal/featuregates/featuregates.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/featuregates/featuregates.go b/internal/featuregates/featuregates.go index 66b956de804..aad444ab8bb 100644 --- a/internal/featuregates/featuregates.go +++ b/internal/featuregates/featuregates.go @@ -20,5 +20,5 @@ var StrictlyTypedInputGate = featuregate.GlobalRegistry().MustRegister(StrictlyT var DisableOpenCensusBridge = featuregate.GlobalRegistry().MustRegister("service.disableOpenCensusBridge", featuregate.StageBeta, - featuregate.WithRegisterFromVersion("v0.104.0"), + featuregate.WithRegisterFromVersion("v0.105.0"), featuregate.WithRegisterDescription("`Disables the OpenCensus bridge meaning any component still using the OpenCensus SDK will no longer be able to produce telemetry.")) From e52b3131b170a0b3b53a3165a11db639809a1372 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:23:16 -0700 Subject: [PATCH 156/168] [chore] group go.opentelemetry.io/build-tools modules (#10579) Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 46774c4aeec..97c5d8a2792 100644 --- a/renovate.json +++ b/renovate.json @@ -62,7 +62,7 @@ }, { "matchManagers": ["gomod"], - "matchSourceUrlPrefixes": ["https://go.opentelemetry.io/build-tools"], + "matchPackagePrefixes": ["go.opentelemetry.io/build-tools"], "groupName": "All go.opentelemetry.io/build-tools packages" } ], From 4c7d342574b7ec3ceda2e9ac274f227ae8b90048 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 9 Jul 2024 16:23:43 -0600 Subject: [PATCH 157/168] [configauth] Deprecate GetClientAuthenticatorContext and GetServerAuthenticatorContext (#10578) #### Description Deprecates GetClientAuthenticatorContext and GetServerAuthenticatorContext. #### Link to tracking issue Related to https://github.com/open-telemetry/opentelemetry-collector/issues/9808 --- .../configauth-removed-deprecated-funcs.yaml | 25 +++++++++++++++ config/configauth/configauth.go | 32 +++++++++++-------- config/configauth/configauth_test.go | 8 ++--- config/configgrpc/configgrpc.go | 4 +-- config/confighttp/confighttp.go | 4 +-- 5 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 .chloggen/configauth-removed-deprecated-funcs.yaml diff --git a/.chloggen/configauth-removed-deprecated-funcs.yaml b/.chloggen/configauth-removed-deprecated-funcs.yaml new file mode 100644 index 00000000000..b6c1779bff7 --- /dev/null +++ b/.chloggen/configauth-removed-deprecated-funcs.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: configauth + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecated `Authentication.GetClientAuthenticatorContext` and `Authentication.GetServerAuthenticatorContext` + +# One or more tracking issues or pull requests related to the change +issues: [10578] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/config/configauth/configauth.go b/config/configauth/configauth.go index dc275f705e0..ccee4216e9f 100644 --- a/config/configauth/configauth.go +++ b/config/configauth/configauth.go @@ -34,15 +34,7 @@ func NewDefaultAuthentication() *Authentication { // GetServerAuthenticator attempts to select the appropriate auth.Server from the list of extensions, // based on the requested extension name. If an authenticator is not found, an error is returned. -// -// Deprecated: [v0.103.0] Use GetServerAuthenticatorContext instead. -func (a Authentication) GetServerAuthenticator(extensions map[component.ID]component.Component) (auth.Server, error) { - return a.GetServerAuthenticatorContext(context.Background(), extensions) -} - -// GetServerAuthenticatorContext attempts to select the appropriate auth.Server from the list of extensions, -// based on the requested extension name. If an authenticator is not found, an error is returned. -func (a Authentication) GetServerAuthenticatorContext(_ context.Context, extensions map[component.ID]component.Component) (auth.Server, error) { +func (a Authentication) GetServerAuthenticator(_ context.Context, extensions map[component.ID]component.Component) (auth.Server, error) { if ext, found := extensions[a.AuthenticatorID]; found { if server, ok := ext.(auth.Server); ok { return server, nil @@ -53,15 +45,18 @@ func (a Authentication) GetServerAuthenticatorContext(_ context.Context, extensi return nil, fmt.Errorf("failed to resolve authenticator %q: %w", a.AuthenticatorID, errAuthenticatorNotFound) } -// Deprecated: [v0.103.0] Use GetClientAuthenticatorContext instead. -func (a Authentication) GetClientAuthenticator(extensions map[component.ID]component.Component) (auth.Client, error) { - return a.GetClientAuthenticatorContext(context.Background(), extensions) +// GetServerAuthenticatorContext attempts to select the appropriate auth.Server from the list of extensions, +// based on the requested extension name. If an authenticator is not found, an error is returned. +// +// Deprecated: [v0.105.0] Use GetServerAuthenticator instead. +func (a Authentication) GetServerAuthenticatorContext(ctx context.Context, extensions map[component.ID]component.Component) (auth.Server, error) { + return a.GetServerAuthenticator(ctx, extensions) } -// GetClientAuthenticatorContext attempts to select the appropriate auth.Client from the list of extensions, +// GetClientAuthenticator attempts to select the appropriate auth.Client from the list of extensions, // based on the component id of the extension. If an authenticator is not found, an error is returned. // This should be only used by HTTP clients. -func (a Authentication) GetClientAuthenticatorContext(_ context.Context, extensions map[component.ID]component.Component) (auth.Client, error) { +func (a Authentication) GetClientAuthenticator(_ context.Context, extensions map[component.ID]component.Component) (auth.Client, error) { if ext, found := extensions[a.AuthenticatorID]; found { if client, ok := ext.(auth.Client); ok { return client, nil @@ -70,3 +65,12 @@ func (a Authentication) GetClientAuthenticatorContext(_ context.Context, extensi } return nil, fmt.Errorf("failed to resolve authenticator %q: %w", a.AuthenticatorID, errAuthenticatorNotFound) } + +// GetClientAuthenticatorContext attempts to select the appropriate auth.Client from the list of extensions, +// based on the component id of the extension. If an authenticator is not found, an error is returned. +// This should be only used by HTTP clients. +// +// Deprecated: [v0.105.0] Use GetClientAuthenticatorContext instead. +func (a Authentication) GetClientAuthenticatorContext(ctx context.Context, extensions map[component.ID]component.Component) (auth.Client, error) { + return a.GetClientAuthenticator(ctx, extensions) +} diff --git a/config/configauth/configauth_test.go b/config/configauth/configauth_test.go index 5e721fec9a9..a19577f9d98 100644 --- a/config/configauth/configauth_test.go +++ b/config/configauth/configauth_test.go @@ -49,7 +49,7 @@ func TestGetServer(t *testing.T) { mockID: tC.authenticator, } - authenticator, err := cfg.GetServerAuthenticatorContext(context.Background(), ext) + authenticator, err := cfg.GetServerAuthenticator(context.Background(), ext) // verify if tC.expected != nil { @@ -68,7 +68,7 @@ func TestGetServerFails(t *testing.T) { AuthenticatorID: component.MustNewID("does_not_exist"), } - authenticator, err := cfg.GetServerAuthenticatorContext(context.Background(), map[component.ID]component.Component{}) + authenticator, err := cfg.GetServerAuthenticator(context.Background(), map[component.ID]component.Component{}) assert.ErrorIs(t, err, errAuthenticatorNotFound) assert.Nil(t, authenticator) } @@ -100,7 +100,7 @@ func TestGetClient(t *testing.T) { mockID: tC.authenticator, } - authenticator, err := cfg.GetClientAuthenticatorContext(context.Background(), ext) + authenticator, err := cfg.GetClientAuthenticator(context.Background(), ext) // verify if tC.expected != nil { @@ -118,7 +118,7 @@ func TestGetClientFails(t *testing.T) { cfg := &Authentication{ AuthenticatorID: component.MustNewID("does_not_exist"), } - authenticator, err := cfg.GetClientAuthenticatorContext(context.Background(), map[component.ID]component.Component{}) + authenticator, err := cfg.GetClientAuthenticator(context.Background(), map[component.ID]component.Component{}) assert.ErrorIs(t, err, errAuthenticatorNotFound) assert.Nil(t, authenticator) } diff --git a/config/configgrpc/configgrpc.go b/config/configgrpc/configgrpc.go index 73176c9dec9..2bffbe4993f 100644 --- a/config/configgrpc/configgrpc.go +++ b/config/configgrpc/configgrpc.go @@ -277,7 +277,7 @@ func (gcs *ClientConfig) toDialOptions(ctx context.Context, host component.Host, return nil, errors.New("no extensions configuration available") } - grpcAuthenticator, cerr := gcs.Auth.GetClientAuthenticatorContext(ctx, host.GetExtensions()) + grpcAuthenticator, cerr := gcs.Auth.GetClientAuthenticator(ctx, host.GetExtensions()) if cerr != nil { return nil, cerr } @@ -393,7 +393,7 @@ func (gss *ServerConfig) toServerOption(host component.Host, settings component. var sInterceptors []grpc.StreamServerInterceptor if gss.Auth != nil { - authenticator, err := gss.Auth.GetServerAuthenticatorContext(context.Background(), host.GetExtensions()) + authenticator, err := gss.Auth.GetServerAuthenticator(context.Background(), host.GetExtensions()) if err != nil { return nil, err } diff --git a/config/confighttp/confighttp.go b/config/confighttp/confighttp.go index fa6ff795331..d787ca9c270 100644 --- a/config/confighttp/confighttp.go +++ b/config/confighttp/confighttp.go @@ -195,7 +195,7 @@ func (hcs *ClientConfig) ToClient(ctx context.Context, host component.Host, sett return nil, errors.New("extensions configuration not found") } - httpCustomAuthRoundTripper, aerr := hcs.Auth.GetClientAuthenticatorContext(ctx, ext) + httpCustomAuthRoundTripper, aerr := hcs.Auth.GetClientAuthenticator(ctx, ext) if aerr != nil { return nil, aerr } @@ -382,7 +382,7 @@ func (hss *ServerConfig) ToServer(_ context.Context, host component.Host, settin } if hss.Auth != nil { - server, err := hss.Auth.GetServerAuthenticatorContext(context.Background(), host.GetExtensions()) + server, err := hss.Auth.GetServerAuthenticator(context.Background(), host.GetExtensions()) if err != nil { return nil, err } From 182c6101e4bfc3bffad661f73ee1bf368fb3e69e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:57:23 +0200 Subject: [PATCH 158/168] fix(deps): update all go.opentelemetry.io/build-tools packages to v0.14.0 (#10580) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [go.opentelemetry.io/build-tools/checkfile](https://togithub.com/open-telemetry/opentelemetry-go-build-tools) | `v0.13.0` -> `v0.14.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fbuild-tools%2fcheckfile/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fbuild-tools%2fcheckfile/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fbuild-tools%2fcheckfile/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fbuild-tools%2fcheckfile/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/build-tools/chloggen](https://togithub.com/open-telemetry/opentelemetry-go-build-tools) | `v0.13.0` -> `v0.14.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fbuild-tools%2fchloggen/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fbuild-tools%2fchloggen/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fbuild-tools%2fchloggen/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fbuild-tools%2fchloggen/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/build-tools/crosslink](https://togithub.com/open-telemetry/opentelemetry-go-build-tools) | `v0.13.0` -> `v0.14.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fbuild-tools%2fcrosslink/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fbuild-tools%2fcrosslink/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fbuild-tools%2fcrosslink/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fbuild-tools%2fcrosslink/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/build-tools/multimod](https://togithub.com/open-telemetry/opentelemetry-go-build-tools) | `v0.13.0` -> `v0.14.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fbuild-tools%2fmultimod/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fbuild-tools%2fmultimod/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fbuild-tools%2fmultimod/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fbuild-tools%2fmultimod/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [go.opentelemetry.io/build-tools/semconvgen](https://togithub.com/open-telemetry/opentelemetry-go-build-tools) | `v0.13.0` -> `v0.14.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fbuild-tools%2fsemconvgen/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fbuild-tools%2fsemconvgen/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fbuild-tools%2fsemconvgen/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fbuild-tools%2fsemconvgen/v0.13.0/v0.14.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
open-telemetry/opentelemetry-go-build-tools (go.opentelemetry.io/build-tools/checkfile) ### [`v0.14.0`](https://togithub.com/open-telemetry/opentelemetry-go-build-tools/blob/HEAD/CHANGELOG.md#v0140) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-go-build-tools/compare/v0.13.0...v0.14.0) ##### 💡 Enhancements 💡 - `semconvgen`: Add `--capitalizations-path` to allow users to add additional strings to the static capitalizations slice in generator.go ([#​528](https://togithub.com/open-telemetry/opentelemetry-go-build-tools/issues/528)) ##### 🧰 Bug fixes 🧰 - `multimod`: Get pseudoversion for each module in a module set separately to support moving modules between module sets. ([#​582](https://togithub.com/open-telemetry/opentelemetry-go-build-tools/issues/582))
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- internal/tools/go.mod | 24 +++++++++---------- internal/tools/go.sum | 55 +++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 32c6a7e56e7..13597909b40 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -9,11 +9,11 @@ require ( github.com/google/addlicense v1.1.1 github.com/jcchavezs/porto v0.6.0 github.com/pavius/impi v0.0.3 - go.opentelemetry.io/build-tools/checkfile v0.13.0 - go.opentelemetry.io/build-tools/chloggen v0.13.0 - go.opentelemetry.io/build-tools/crosslink v0.13.0 - go.opentelemetry.io/build-tools/multimod v0.13.0 - go.opentelemetry.io/build-tools/semconvgen v0.13.0 + go.opentelemetry.io/build-tools/checkfile v0.14.0 + go.opentelemetry.io/build-tools/chloggen v0.14.0 + go.opentelemetry.io/build-tools/crosslink v0.14.0 + go.opentelemetry.io/build-tools/multimod v0.14.0 + go.opentelemetry.io/build-tools/semconvgen v0.14.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 golang.org/x/tools v0.23.0 golang.org/x/vuln v1.1.2 @@ -35,7 +35,7 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect - github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect + github.com/ProtonMail/go-crypto v1.0.0 // indirect github.com/alecthomas/assert/v2 v2.3.0 // indirect github.com/alecthomas/go-check-sumtype v0.1.4 // indirect github.com/alexkohler/nakedret/v2 v2.0.4 // indirect @@ -75,7 +75,7 @@ require ( github.com/go-critic/go-critic v0.11.4 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.5.0 // indirect - github.com/go-git/go-git/v5 v5.11.0 // indirect + github.com/go-git/go-git/v5 v5.12.0 // indirect github.com/go-toolsmith/astcast v1.1.0 // indirect github.com/go-toolsmith/astcopy v1.1.0 // indirect github.com/go-toolsmith/astequal v1.2.0 // indirect @@ -163,20 +163,20 @@ require ( github.com/sashamelentyev/interfacebloat v1.1.0 // indirect github.com/sashamelentyev/usestdlibvars v1.26.0 // indirect github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect - github.com/sergi/go-diff v1.1.0 // indirect + github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sivchari/containedctx v1.0.3 // indirect github.com/sivchari/tenv v1.7.1 // indirect - github.com/skeema/knownhosts v1.2.1 // indirect + github.com/skeema/knownhosts v1.2.2 // indirect github.com/sonatard/noctx v0.0.2 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/sourcegraph/go-diff v0.7.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect - github.com/spf13/cobra v1.8.0 // indirect + github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.18.2 // indirect + github.com/spf13/viper v1.19.0 // indirect github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect github.com/stretchr/objx v0.5.2 // indirect @@ -200,7 +200,7 @@ require ( gitlab.com/bosi/decorder v0.4.2 // indirect go-simpler.org/musttag v0.12.2 // indirect go-simpler.org/sloglint v0.7.1 // indirect - go.opentelemetry.io/build-tools v0.13.0 // indirect + go.opentelemetry.io/build-tools v0.14.0 // indirect go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index b4dbadb49e0..6bfbfd4f230 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -29,8 +29,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OpenPeeDeeP/depguard/v2 v2.2.0 h1:vDfG60vDtIuf0MEOhmLlLLSzqaRM8EMcgJPdp74zmpA= github.com/OpenPeeDeeP/depguard/v2 v2.2.0/go.mod h1:CIzddKRvLBC4Au5aYP/i3nyaWQ+ClszLIuVocRiCYFQ= -github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg= -github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78= +github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/a8m/envsubst v1.4.2 h1:4yWIHXOLEJHQEFd4UjrWDrYeYlV7ncFWJOCBRLOZHQg= github.com/a8m/envsubst v1.4.2/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY= github.com/alecthomas/assert/v2 v2.3.0 h1:mAsH2wmvjsuvyBvAmCtm7zFsBlb8mIHx5ySLVdDZXL0= @@ -89,7 +89,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= @@ -122,8 +122,8 @@ github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= github.com/ghostiam/protogetter v0.3.6 h1:R7qEWaSgFCsy20yYHNIJsU9ZOb8TziSRRxuAOTVKeOk= github.com/ghostiam/protogetter v0.3.6/go.mod h1:7lpeDnEJ1ZjL/YtyoN99ljO4z0pd3H0d18/t2dPBxHw= -github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= -github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= +github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= +github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8= github.com/go-critic/go-critic v0.11.4 h1:O7kGOCx0NDIni4czrkRIXTnit0mkyKOCePh3My6OyEU= github.com/go-critic/go-critic v0.11.4/go.mod h1:2QAdo4iuLik5S9YG0rT4wcZ8QxwHYkrr6/2MWAiv/vc= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= @@ -132,8 +132,8 @@ github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+ github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= -github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= +github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= +github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= @@ -370,8 +370,8 @@ github.com/sashamelentyev/usestdlibvars v1.26.0 h1:LONR2hNVKxRmzIrZR0PhSF3mhCAzv github.com/sashamelentyev/usestdlibvars v1.26.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 h1:rnO6Zp1YMQwv8AyxzuwsVohljJgp4L0ZqiCgtACsPsc= github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9/go.mod h1:dg7lPlu/xK/Ut9SedURCoZbVCR4yC7fM65DtH9/CDHs= -github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= @@ -383,8 +383,8 @@ github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+W github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4= github.com/sivchari/tenv v1.7.1 h1:PSpuD4bu6fSmtWMxSGWcvqUUgIn7k3yOJhOIzVWn8Ak= github.com/sivchari/tenv v1.7.1/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= -github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= -github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= +github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= github.com/sonatard/noctx v0.0.2 h1:L7Dz4De2zDQhW8S0t+KUjY0MAQJd6SgVwhzNIc4ok00= github.com/sonatard/noctx v0.0.2/go.mod h1:kzFz+CzWSjQ2OzIm46uJZoXuBpa2+0y3T36U18dWqIo= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= @@ -395,12 +395,12 @@ github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= -github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= +github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= +github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= @@ -471,18 +471,18 @@ go-simpler.org/musttag v0.12.2 h1:J7lRc2ysXOq7eM8rwaTYnNrHd5JwjppzB6mScysB2Cs= go-simpler.org/musttag v0.12.2/go.mod h1:uN1DVIasMTQKk6XSik7yrJoEysGtR2GRqvWnI9S7TYM= go-simpler.org/sloglint v0.7.1 h1:qlGLiqHbN5islOxjeLXoPtUdZXb669RW+BDQ+xOSNoU= go-simpler.org/sloglint v0.7.1/go.mod h1:OlaVDRh/FKKd4X4sIMbsz8st97vomydceL146Fthh/c= -go.opentelemetry.io/build-tools v0.13.0 h1:0I3jJQ2zcJU8k4ZjyHNqUBX2Len1UvBIOzVP4b50g9A= -go.opentelemetry.io/build-tools v0.13.0/go.mod h1:PEtg5iWjNI9WAlKXP/xll/hgbq/Cp4Ma4T1ssKB2T0Q= -go.opentelemetry.io/build-tools/checkfile v0.13.0 h1:Nq13fOLpF9T+y4birZbfv6JurFC1Pla5UwC+t0GMbAo= -go.opentelemetry.io/build-tools/checkfile v0.13.0/go.mod h1:fRNphqnBebBiwL1A3OofgCDiJ6enb73uKGIO+n0gHPI= -go.opentelemetry.io/build-tools/chloggen v0.13.0 h1:C30r8ecNuJ30T3+vSvFJhaXUjUpx6r07nM3weDCpS7U= -go.opentelemetry.io/build-tools/chloggen v0.13.0/go.mod h1:1Ueg04+D2eU7Lm80RqS4DYTdtkHwTmulQZL0tUI4iAk= -go.opentelemetry.io/build-tools/crosslink v0.13.0 h1:R0V89bTYzoJpasiOIYiQo6txL/ZTzMdEuthJ4gLUTF8= -go.opentelemetry.io/build-tools/crosslink v0.13.0/go.mod h1:aYIwOj9b3Nmgm6nIZZk28tF/JjpicI8xenEVUeoVNp0= -go.opentelemetry.io/build-tools/multimod v0.13.0 h1:HGAP3zCM8vOTNJSQbjQ5VbKZSctIZxppPBxRTzye7ic= -go.opentelemetry.io/build-tools/multimod v0.13.0/go.mod h1:CxZp68c4PIN+bYlVOGB2FvE5zZMBuGz7cGSHv2L7pSc= -go.opentelemetry.io/build-tools/semconvgen v0.13.0 h1:gGCCXzAQa4/9osvjQr/twTSiPFloxJOz01/segikweI= -go.opentelemetry.io/build-tools/semconvgen v0.13.0/go.mod h1:Xwolx7cXWG3QYYLvDMeO4+IkZGna+4SkI6qadeLDkW4= +go.opentelemetry.io/build-tools v0.14.0 h1:fcnriXRUVpnVIFXtdlc1fTn9g+YRxzOV0xhw4nN919c= +go.opentelemetry.io/build-tools v0.14.0/go.mod h1:pxTqOr0uL/0s9+xnpuKTAhmVFDssF3O4UUUuWKQqThE= +go.opentelemetry.io/build-tools/checkfile v0.14.0 h1:vj4F4f5uZPH4L3hpEMDcQvnZ7b9T3O2ecWLfgWiXagM= +go.opentelemetry.io/build-tools/checkfile v0.14.0/go.mod h1:HfNhfFB80nEE7z7u+PFP6B0AcS/H9tZRBXpXOW4Y6ZM= +go.opentelemetry.io/build-tools/chloggen v0.14.0 h1:qVal1JO6V5xTaQ6b07eBAcc0jyCblk8lfVAJHijwqFk= +go.opentelemetry.io/build-tools/chloggen v0.14.0/go.mod h1:+lbmAIYUT2OewAXITyvPACRxruPm44tNH4k6hIUuasE= +go.opentelemetry.io/build-tools/crosslink v0.14.0 h1:yxCsELb3A81W4p8RSDjPSg9WcCTkM3+X+tYUzaaJ3uU= +go.opentelemetry.io/build-tools/crosslink v0.14.0/go.mod h1:QJ+E5i4+CCg40jlOYQsfBq4lVe2cKCyhftEXDsqNlhg= +go.opentelemetry.io/build-tools/multimod v0.14.0 h1:AaM06mlSga3IaCj6eM+Kg9tei062qsU6Z+x6ENmfBWI= +go.opentelemetry.io/build-tools/multimod v0.14.0/go.mod h1:lY7ZccnZ6dg4uRcghXa4p9v4IDvI9Yf/XFdlpPO84AA= +go.opentelemetry.io/build-tools/semconvgen v0.14.0 h1:lOHKG4Tc/mfc6yb0an4hdi9oLbIrf/mUUIF3U8HbM8Q= +go.opentelemetry.io/build-tools/semconvgen v0.14.0/go.mod h1:JRu+X6WMMK1fvo9toZM5hb7p6Pug7NXLjbq5J0WcS18= go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -637,7 +637,6 @@ gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 637b1f42fcb7cbb7ef8a50dcf41d0a089623a8b7 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Wed, 10 Jul 2024 08:17:41 -0600 Subject: [PATCH 159/168] [confmap] Fix bug where expand didn't honor escaping (#10560) #### Description When we promoted `confmap.unifyEnvVarExpansion` to beta, we found that the new expansion logic in `confmap` wasn't handling escaping of `$$` like it is supposed to. This PR fixes that bug, but adding escaping logic for `$$`. @azunna1 this fixes the bug you mentioned in https://github.com/open-telemetry/opentelemetry-collector/pull/10435 around the metricstransformprocessor: ```yaml metricstransform: transforms: - include: '^k8s\.(.*)\.(.*)$$' match_type: regexp action: update new_name: 'kubernetes.$${1}.$${2}' - include: '^container_([0-9A-Za-z]+)_([0-9A-Za-z]+)_.*' match_type: regexp action: update new_name: 'container.$${1}.$${2}' ``` #### Testing Added new unit tests explicitly for escaping logic --- .chloggen/confmap-fix-escape-bug.yaml | 25 ++++++++++++++ confmap/expand.go | 16 +++++++++ confmap/expand_test.go | 43 ++++++++++++++++++++++++ confmap/resolver.go | 10 +++++- confmap/testdata/expand-escaped-env.yaml | 31 +++++++++++++++++ 5 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 .chloggen/confmap-fix-escape-bug.yaml create mode 100644 confmap/testdata/expand-escaped-env.yaml diff --git a/.chloggen/confmap-fix-escape-bug.yaml b/.chloggen/confmap-fix-escape-bug.yaml new file mode 100644 index 00000000000..7d8098e4177 --- /dev/null +++ b/.chloggen/confmap-fix-escape-bug.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confmap + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fixes issue where confmap could not escape `$$` when `confmap.unifyEnvVarExpansion` is enabled. + +# One or more tracking issues or pull requests related to the change +issues: [10560] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/confmap/expand.go b/confmap/expand.go index 8372ef120d2..16ef9dbe22f 100644 --- a/confmap/expand.go +++ b/confmap/expand.go @@ -81,6 +81,7 @@ func (mr *Resolver) expandValue(ctx context.Context, value any) (any, bool, erro // findURI attempts to find the first potentially expandable URI in input. It returns a potentially expandable // URI, or an empty string if none are found. // Note: findURI is only called when input contains a closing bracket. +// We do not support escaping nested URIs (such as ${env:$${FOO}}, since that would result in an invalid outer URI (${env:${FOO}}). func (mr *Resolver) findURI(input string) string { closeIndex := strings.Index(input, "}") remaining := input[closeIndex+1:] @@ -98,6 +99,21 @@ func (mr *Resolver) findURI(input string) string { return mr.findURI(remaining) } + index := openIndex - 1 + currentRune := '$' + count := 0 + for index >= 0 && currentRune == '$' { + currentRune = rune(input[index]) + if currentRune == '$' { + count++ + } + index-- + } + // if we found an odd number of immediately $ preceding ${, then the expansion is escaped + if count%2 == 1 { + return "" + } + return input[openIndex : closeIndex+1] } diff --git a/confmap/expand_test.go b/confmap/expand_test.go index 9cca35c7008..25f54496845 100644 --- a/confmap/expand_test.go +++ b/confmap/expand_test.go @@ -577,3 +577,46 @@ func TestResolverDefaultProviderExpand(t *testing.T) { require.NoError(t, err) assert.Equal(t, map[string]any{"foo": "localhost"}, cfgMap.ToStringMap()) } + +func Test_EscapedEnvVars(t *testing.T) { + const mapValue2 = "some map value" + + expectedMap := map[string]any{ + "test_map": map[string]any{ + "recv.1": "$MAP_VALUE_1", + "recv.2": "$$MAP_VALUE_2", + "recv.3": "$$MAP_VALUE_3", + "recv.4": "$" + mapValue2, + "recv.5": "some${MAP_VALUE_4}text", + "recv.6": "${ONE}${TWO}", + "recv.7": "text$", + "recv.8": "$", + "recv.9": "${1}${env:2}", + "recv.10": "some${env:MAP_VALUE_4}text", + "recv.11": "${env:" + mapValue2 + "}", + "recv.12": "${env:${MAP_VALUE_2}}", + "recv.13": "env:MAP_VALUE_2}${MAP_VALUE_2}{", + "recv.14": "${env:MAP_VALUE_2${MAP_VALUE_2}", + "recv.15": "$" + mapValue2, + }} + + fileProvider := newFakeProvider("file", func(_ context.Context, uri string, _ WatcherFunc) (*Retrieved, error) { + return NewRetrieved(newConfFromFile(t, uri[5:])) + }) + envProvider := newFakeProvider("env", func(_ context.Context, uri string, _ WatcherFunc) (*Retrieved, error) { + if uri == "env:MAP_VALUE_2" { + return NewRetrieved(mapValue2) + } + return nil, errors.New("should not be expanding any other env vars") + }) + + resolver, err := NewResolver(ResolverSettings{URIs: []string{filepath.Join("testdata", "expand-escaped-env.yaml")}, ProviderFactories: []ProviderFactory{fileProvider, envProvider}, ConverterFactories: nil, DefaultScheme: "env"}) + require.NoError(t, err) + + // Test that expanded configs are the same with the simple config with no env vars. + cfgMap, err := resolver.Resolve(context.Background()) + require.NoError(t, err) + m := cfgMap.ToStringMap() + assert.Equal(t, expectedMap, m) + +} diff --git a/confmap/resolver.go b/confmap/resolver.go index 7c9ed303c73..148049a5ad3 100644 --- a/confmap/resolver.go +++ b/confmap/resolver.go @@ -12,6 +12,8 @@ import ( "go.uber.org/multierr" "go.uber.org/zap" + + "go.opentelemetry.io/collector/internal/featuregates" ) // follows drive-letter specification: @@ -171,7 +173,13 @@ func (mr *Resolver) Resolve(ctx context.Context) (*Conf, error) { if err != nil { return nil, err } - cfgMap[k] = val + + if v, ok := val.(string); ok && featuregates.UseUnifiedEnvVarExpansionRules.IsEnabled() { + cfgMap[k] = strings.ReplaceAll(v, "$$", "$") + } else { + cfgMap[k] = val + } + } retMap = NewFromStringMap(cfgMap) diff --git a/confmap/testdata/expand-escaped-env.yaml b/confmap/testdata/expand-escaped-env.yaml new file mode 100644 index 00000000000..6b2cd162831 --- /dev/null +++ b/confmap/testdata/expand-escaped-env.yaml @@ -0,0 +1,31 @@ +test_map: + # $$ -> escaped $ + recv.1: "$$MAP_VALUE_1" + # $$$ -> escaped $ + $MAP_VALUE_2 + recv.2: "$$$MAP_VALUE_2" + # $$$$ -> two escaped $ + recv.3: "$$$$MAP_VALUE_3" + # $$$ -> escaped $ + substituted env var + recv.4: "$$${MAP_VALUE_2}" + # escaped $ in the middle + recv.5: "some$${MAP_VALUE_4}text" + # two escaped $ + recv.6: "$${ONE}$${TWO}" + # trailing escaped $ + recv.7: "text$$" + # escaped $ alone + recv.8: "$$" + # Escape numbers + recv.9: "$${1}$${env:2}" + # can escape provider + recv.10: "some$${env:MAP_VALUE_4}text" + # can escape outer when nested + recv.11: "$${env:${MAP_VALUE_2}}" + # can escape inner and outer when nested + recv.12: "$${env:$${MAP_VALUE_2}}" + # can escape partial + recv.13: "env:MAP_VALUE_2}$${MAP_VALUE_2}{" + # can escape partial + recv.14: "${env:MAP_VALUE_2$${MAP_VALUE_2}" + # $$$ -> escaped $ + substituted env var + recv.15: "$$${env:MAP_VALUE_2}" From 341b33f465480abc13817c7320c6b21388f7a317 Mon Sep 17 00:00:00 2001 From: Adriel Perkins Date: Wed, 10 Jul 2024 12:03:10 -0400 Subject: [PATCH 160/168] [mdatagen] fix generated comp test for extensions and unused imports in templates (#10477) #### Description When upgrading beyond `v0.101.0` of `mdatagen` I ran into issues upgrading when running `golanglint-ci` because of unused imports. Namely, in `component_tests` the `component` was removed from [this commit](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.101.0...v0.102.0?diff=split&w=#diff-abf7cf477183f2c7e2f9425655bea3a2e2060eaba8fb6aa9c9a9558017c21f1e) which was not caught by tests (it appears we only test receiver components & not others). The logic that generates tests for extensions, where I caught this error, ends up with a `generated_component_test` that does not use `component` in the package at all. I would've thought the contrib repo would've detected this issue since they also use `mdatagen` and there are extensions there + golangci-lint. I haven't dug into the why it wasn't caught there yet. > This is just a quick fix for extensions. I suspect this issue may pop up in other components as time goes on. Long term is more tests for other components. #### Testing I ran this locally against my own repo where the issue originally showed & ensured the value would be templated out appropriately. ![image](https://github.com/open-telemetry/opentelemetry-collector/assets/25961386/f82abb28-7b78-401f-8875-cb2c66f5cf9b) --- .chloggen/fix-component-tests.yaml | 25 +++++++++++++++++++ cmd/mdatagen/templates/component_test.go.tmpl | 2 +- cmd/mdatagen/templates/telemetry_test.go.tmpl | 2 -- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 .chloggen/fix-component-tests.yaml diff --git a/.chloggen/fix-component-tests.yaml b/.chloggen/fix-component-tests.yaml new file mode 100644 index 00000000000..5f9543f0561 --- /dev/null +++ b/.chloggen/fix-component-tests.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: mdatagen + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: fix generated comp test for extensions and unused imports in templates + +# One or more tracking issues or pull requests related to the change +issues: [10477] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/mdatagen/templates/component_test.go.tmpl b/cmd/mdatagen/templates/component_test.go.tmpl index 45deb99e545..bfc70c2b751 100644 --- a/cmd/mdatagen/templates/component_test.go.tmpl +++ b/cmd/mdatagen/templates/component_test.go.tmpl @@ -16,7 +16,7 @@ import ( {{- end }} "github.com/stretchr/testify/require" - {{- if not (and .Tests.SkipLifecycle .Tests.SkipShutdown) }} + {{- if and (not (and .Tests.SkipLifecycle .Tests.SkipShutdown)) (not isExtension) }} "go.opentelemetry.io/collector/component" {{- end }} "go.opentelemetry.io/collector/component/componenttest" diff --git a/cmd/mdatagen/templates/telemetry_test.go.tmpl b/cmd/mdatagen/templates/telemetry_test.go.tmpl index 244a0c92a0b..0663d3a0790 100644 --- a/cmd/mdatagen/templates/telemetry_test.go.tmpl +++ b/cmd/mdatagen/templates/telemetry_test.go.tmpl @@ -7,8 +7,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/metric" - sdkmetric "go.opentelemetry.io/otel/sdk/metric" - "go.opentelemetry.io/otel/sdk/metric/metricdata" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" From 30de6856759ea2387c1a946de318429b4f0f503f Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:04:31 -0600 Subject: [PATCH 161/168] [chore] Update restore-contrib (#10589) --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 7806c1dd54e..34c0207d10e 100644 --- a/Makefile +++ b/Makefile @@ -349,6 +349,7 @@ restore-contrib: -dropreplace go.opentelemetry.io/collector/extension/memorylimiterextension \ -dropreplace go.opentelemetry.io/collector/extension/zpagesextension \ -dropreplace go.opentelemetry.io/collector/featuregate \ + -dropreplace go.opentelemetry.io/collector/internal/featuregates \ -dropreplace go.opentelemetry.io/collector/otelcol \ -dropreplace go.opentelemetry.io/collector/otelcol/otelcoltest \ -dropreplace go.opentelemetry.io/collector/pdata \ From 54b8c191dfd4d04073269a90943a55f430d90ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Thu, 11 Jul 2024 12:23:28 +0200 Subject: [PATCH 162/168] [chore][readme] Clarify purpose of Slack and video calls (#10536) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR implements the proposal at #7085 while addressing the following concerns: - makes it explicit that ad-hoc meetings are possible - sets a timeline for the split of ad-hoc calls - sets the expectation that people don't have to join the calls to be heard - and the expectation that everything that was decided is tracked via github Closes #7085 Signed-off-by: Juraci Paixão Kröhling --------- Signed-off-by: Juraci Paixão Kröhling Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- README.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/README.md b/README.md index a42b3a51c29..87ffac62672 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,34 @@ Objectives: - Extensible: Customizable without touching the core code. - Unified: Single codebase, deployable as an agent or collector with support for traces, metrics and logs. +## Community + +The OpenTelemetry Collector SIG is present at the [#otel-collector](https://cloud-native.slack.com/archives/C01N6P7KR6W) +channel on the CNCF Slack and [meets once a week](https://github.com/open-telemetry/community#implementation-sigs) via +video calls. Everyone is invited to join those calls, which typically serves the following purposes: + +- meet the humans behind the project +- get an opinion about specific proposals +- look for a sponsor for a proposed component after trying already via GitHub and Slack +- get attention to a specific pull-request that got stuck and is difficult to discuss asynchronously + +Between 11 July 2024 and 09 January 2025, we'll have our video calls rotating between three time slots, in order to +allow everyone to join at least once every three meetings: + +- [00:00 UTC](https://dateful.com/convert/utc?t=0000) +- [12:00 UTC](https://dateful.com/convert/utc?t=1200) +- [16:00 UTC](https://dateful.com/convert/utc?t=1600) + +Contributors to the project are also welcome to have ad-hoc meetings for synchronous discussions about specific points. +Post a note in #otel-collector on Slack inviting others, specifying the topic to be discussed. Unless there are strong +reasons to keep the meeting private, please make it an open invitation for other contributors to join. Try also to +identify who would be the other contributors interested on that topic and in which timezones they are. + +Remember that our source of truth is GitHub: every decision made via Slack or video calls has to be recorded in the +relevant GitHub issue. Ideally, the agenda items from the meeting notes would include a link to the issue or pull +request where a discussion is happening already. We acknowledge that not everyone can join Slack or the synchronous +calls and don't want them to feel excluded. + ## Supported OTLP version This code base is currently built against using OTLP protocol v1.3.1, From 5cd2421d8a50db1c78387fbe16e50ca8a9da54b7 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Thu, 11 Jul 2024 10:08:27 -0700 Subject: [PATCH 163/168] [exporterhelper] Deprecate the obsreport API (#10594) Deprecate the obsreport API in the exporterhelper package. The top-level helpers `exporterhelper.New[Metrics|Traces|Logs]Exporter` are supposed to be used instead. Resolves https://github.com/open-telemetry/opentelemetry-collector/issues/10592 --------- Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- ...xporterhelper-deprecate-obsreport-api.yaml | 20 ++++++++++++++ exporter/exporterhelper/obsexporter.go | 27 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 .chloggen/exporterhelper-deprecate-obsreport-api.yaml diff --git a/.chloggen/exporterhelper-deprecate-obsreport-api.yaml b/.chloggen/exporterhelper-deprecate-obsreport-api.yaml new file mode 100644 index 00000000000..3eb4a17ebab --- /dev/null +++ b/.chloggen/exporterhelper-deprecate-obsreport-api.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'deprecation' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate the obsreport API in the exporterhelper package. + +# One or more tracking issues or pull requests related to the change +issues: [10592] + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/exporter/exporterhelper/obsexporter.go b/exporter/exporterhelper/obsexporter.go index 1e4d1179f4d..57435f251e5 100644 --- a/exporter/exporterhelper/obsexporter.go +++ b/exporter/exporterhelper/obsexporter.go @@ -19,6 +19,9 @@ import ( ) // ObsReport is a helper to add observability to an exporter. +// +// Deprecated: [v0.105.0] Not expected to be used directly. +// If needed, report your use case in https://github.com/open-telemetry/opentelemetry-collector/issues/10592. type ObsReport struct { level configtelemetry.Level spanNamePrefix string @@ -29,12 +32,18 @@ type ObsReport struct { } // ObsReportSettings are settings for creating an ObsReport. +// +// Deprecated: [v0.105.0] Not expected to be used directly. +// If needed, report your use case in https://github.com/open-telemetry/opentelemetry-collector/issues/10592. type ObsReportSettings struct { ExporterID component.ID ExporterCreateSettings exporter.Settings } // NewObsReport creates a new Exporter. +// +// Deprecated: [v0.105.0] Not expected to be used directly. +// If needed, report your use case in https://github.com/open-telemetry/opentelemetry-collector/issues/10592. func NewObsReport(cfg ObsReportSettings) (*ObsReport, error) { return newExporter(cfg) } @@ -62,11 +71,17 @@ func newExporter(cfg ObsReportSettings) (*ObsReport, error) { // StartTracesOp is called at the start of an Export operation. // The returned context should be used in other calls to the Exporter functions // dealing with the same export operation. +// +// Deprecated: [v0.105.0] Not expected to be used directly. +// If needed, report your use case in https://github.com/open-telemetry/opentelemetry-collector/issues/10592. func (or *ObsReport) StartTracesOp(ctx context.Context) context.Context { return or.startOp(ctx, obsmetrics.ExportTraceDataOperationSuffix) } // EndTracesOp completes the export operation that was started with StartTracesOp. +// +// Deprecated: [v0.105.0] Not expected to be used directly. +// If needed, report your use case in https://github.com/open-telemetry/opentelemetry-collector/issues/10592. func (or *ObsReport) EndTracesOp(ctx context.Context, numSpans int, err error) { numSent, numFailedToSend := toNumItems(numSpans, err) or.recordMetrics(context.WithoutCancel(ctx), component.DataTypeTraces, numSent, numFailedToSend) @@ -76,12 +91,18 @@ func (or *ObsReport) EndTracesOp(ctx context.Context, numSpans int, err error) { // StartMetricsOp is called at the start of an Export operation. // The returned context should be used in other calls to the Exporter functions // dealing with the same export operation. +// +// Deprecated: [v0.105.0] Not expected to be used directly. +// If needed, report your use case in https://github.com/open-telemetry/opentelemetry-collector/issues/10592. func (or *ObsReport) StartMetricsOp(ctx context.Context) context.Context { return or.startOp(ctx, obsmetrics.ExportMetricsOperationSuffix) } // EndMetricsOp completes the export operation that was started with // StartMetricsOp. +// +// Deprecated: [v0.105.0] Not expected to be used directly. +// If needed, report your use case in https://github.com/open-telemetry/opentelemetry-collector/issues/10592. func (or *ObsReport) EndMetricsOp(ctx context.Context, numMetricPoints int, err error) { numSent, numFailedToSend := toNumItems(numMetricPoints, err) or.recordMetrics(context.WithoutCancel(ctx), component.DataTypeMetrics, numSent, numFailedToSend) @@ -91,11 +112,17 @@ func (or *ObsReport) EndMetricsOp(ctx context.Context, numMetricPoints int, err // StartLogsOp is called at the start of an Export operation. // The returned context should be used in other calls to the Exporter functions // dealing with the same export operation. +// +// Deprecated: [v0.105.0] Not expected to be used directly. +// If needed, report your use case in https://github.com/open-telemetry/opentelemetry-collector/issues/10592. func (or *ObsReport) StartLogsOp(ctx context.Context) context.Context { return or.startOp(ctx, obsmetrics.ExportLogsOperationSuffix) } // EndLogsOp completes the export operation that was started with StartLogsOp. +// +// Deprecated: [v0.105.0] Not expected to be used directly. +// If needed, report your use case in https://github.com/open-telemetry/opentelemetry-collector/issues/10592. func (or *ObsReport) EndLogsOp(ctx context.Context, numLogRecords int, err error) { numSent, numFailedToSend := toNumItems(numLogRecords, err) or.recordMetrics(context.WithoutCancel(ctx), component.DataTypeLogs, numSent, numFailedToSend) From 09a929e6d20d2cd059e840f22f66dece18201d2b Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:33:39 -0600 Subject: [PATCH 164/168] Properly handle error code translation (#10574) #### Description Fixes a bug where the otlpreceiver was not translating grpc error codes to http status codes the same way that the otlp exporter was translating http status codes to grpc error codes. #### Link to tracking issue Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/10538 #### Testing Added unit tests --- .../fix-http-grpc-error-code-mapping.yaml | 25 +++++++++++++++++++ .../otlpreceiver/internal/errors/errors.go | 12 +++++++++ .../internal/errors/errors_test.go | 22 +++++++++++++++- receiver/otlpreceiver/otlp_test.go | 6 ++--- 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 .chloggen/fix-http-grpc-error-code-mapping.yaml diff --git a/.chloggen/fix-http-grpc-error-code-mapping.yaml b/.chloggen/fix-http-grpc-error-code-mapping.yaml new file mode 100644 index 00000000000..93ccc784ae9 --- /dev/null +++ b/.chloggen/fix-http-grpc-error-code-mapping.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otlpreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fixes a bug where the otlp receiver's http response was not properly translating grpc error codes to http status codes. + +# One or more tracking issues or pull requests related to the change +issues: [10574] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/receiver/otlpreceiver/internal/errors/errors.go b/receiver/otlpreceiver/internal/errors/errors.go index 0619b7aa8ea..519a31fbc25 100644 --- a/receiver/otlpreceiver/internal/errors/errors.go +++ b/receiver/otlpreceiver/internal/errors/errors.go @@ -40,6 +40,18 @@ func GetHTTPStatusCodeFromStatus(s *status.Status) int { case codes.ResourceExhausted: return http.StatusTooManyRequests // Not Retryable + case codes.InvalidArgument: + return http.StatusBadRequest + // Not Retryable + case codes.Unauthenticated: + return http.StatusUnauthorized + // Not Retryable + case codes.PermissionDenied: + return http.StatusForbidden + // Not Retryable + case codes.Unimplemented: + return http.StatusNotFound + // Not Retryable default: return http.StatusInternalServerError } diff --git a/receiver/otlpreceiver/internal/errors/errors_test.go b/receiver/otlpreceiver/internal/errors/errors_test.go index 35d8255ffcf..b56966bc441 100644 --- a/receiver/otlpreceiver/internal/errors/errors_test.go +++ b/receiver/otlpreceiver/internal/errors/errors_test.go @@ -58,7 +58,7 @@ func Test_GetHTTPStatusCodeFromStatus(t *testing.T) { }, { name: "Non-retryable Status", - input: status.New(codes.InvalidArgument, "test"), + input: status.New(codes.Internal, "test"), expected: http.StatusInternalServerError, }, { @@ -66,6 +66,26 @@ func Test_GetHTTPStatusCodeFromStatus(t *testing.T) { input: status.New(codes.ResourceExhausted, "test"), expected: http.StatusTooManyRequests, }, + { + name: "Specifically 400", + input: status.New(codes.InvalidArgument, "test"), + expected: http.StatusBadRequest, + }, + { + name: "Specifically 401", + input: status.New(codes.Unauthenticated, "test"), + expected: http.StatusUnauthorized, + }, + { + name: "Specifically 403", + input: status.New(codes.PermissionDenied, "test"), + expected: http.StatusForbidden, + }, + { + name: "Specifically 404", + input: status.New(codes.Unimplemented, "test"), + expected: http.StatusNotFound, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/receiver/otlpreceiver/otlp_test.go b/receiver/otlpreceiver/otlp_test.go index ef5db33765b..5cca94b0926 100644 --- a/receiver/otlpreceiver/otlp_test.go +++ b/receiver/otlpreceiver/otlp_test.go @@ -104,8 +104,8 @@ func TestJsonHttp(t *testing.T) { name: "Permanent GRPCError", encoding: "", contentType: "application/json", - err: status.New(codes.InvalidArgument, "").Err(), - expectedStatus: &spb.Status{Code: int32(codes.InvalidArgument), Message: ""}, + err: status.New(codes.Internal, "").Err(), + expectedStatus: &spb.Status{Code: int32(codes.Internal), Message: ""}, expectedStatusCode: http.StatusInternalServerError, }, { @@ -361,7 +361,7 @@ func TestProtoHttp(t *testing.T) { encoding: "", err: status.New(codes.InvalidArgument, "").Err(), expectedStatus: &spb.Status{Code: int32(codes.InvalidArgument), Message: ""}, - expectedStatusCode: http.StatusInternalServerError, + expectedStatusCode: http.StatusBadRequest, }, { name: "Retryable GRPCError", From 08b0be72555a376659ce49df6817cf34f0daa9fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Thu, 11 Jul 2024 23:43:08 +0200 Subject: [PATCH 165/168] [telemetry] Add ability to set service.name for spans emitted by the Collector (#10490) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Description This PR bridges the config that is exposed to Collector users to the internal format expected by the config helpers around the tracer provider. #### Link to tracking issue Fixes #10489 #### Testing Manual testing performed. Config: ```yaml receivers: otlp: protocols: http: grpc: exporters: debug: service: pipelines: traces: receivers: [otlp] exporters: [debug] metrics: receivers: [otlp] exporters: [debug] logs: receivers: [otlp] exporters: [debug] telemetry: traces: processors: - batch: schedule_delay: 1000 exporter: otlp: endpoint: https://otlp-gateway-prod-eu-west-2.grafana.net/otlp/v1/traces protocol: http/protobuf headers: Authorization: "Basic ..." metrics: level: detailed readers: - periodic: exporter: otlp: endpoint: https://otlp-gateway-prod-eu-west-2.grafana.net/otlp/v1/metrics protocol: http/protobuf headers: Authorization: "Basic ..." resource: "service.name": "otelcol-own-telemetry" ``` Sent this telemetry to the collector: ```console telemetrygen traces --traces 1 --otlp-insecure --otlp-attributes='cookbook="own-telemetry"' ``` Resulting in this: ![image](https://github.com/open-telemetry/opentelemetry-collector/assets/13387/b55d281b-8941-4b78-9f16-c08f495b6e89) #### Documentation None. Signed-off-by: Juraci Paixão Kröhling --------- Signed-off-by: Juraci Paixão Kröhling --- ...oehling_fix-servicename-own-telemetry.yaml | 4 ++++ service/telemetry/factory.go | 4 ++-- service/telemetry/tracer.go | 23 ++++++++++++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 .chloggen/jpkroehling_fix-servicename-own-telemetry.yaml diff --git a/.chloggen/jpkroehling_fix-servicename-own-telemetry.yaml b/.chloggen/jpkroehling_fix-servicename-own-telemetry.yaml new file mode 100644 index 00000000000..0fe7a6f6685 --- /dev/null +++ b/.chloggen/jpkroehling_fix-servicename-own-telemetry.yaml @@ -0,0 +1,4 @@ +change_type: bug_fix +component: service/telemetry +note: Add ability to set service.name for spans emitted by the Collector +issues: [10489] diff --git a/service/telemetry/factory.go b/service/telemetry/factory.go index c236d3c5733..edcca9e373f 100644 --- a/service/telemetry/factory.go +++ b/service/telemetry/factory.go @@ -51,9 +51,9 @@ func NewFactory() Factory { c := *cfg.(*Config) return newLogger(c.Logs, set.ZapOptions) }), - internal.WithTracerProvider(func(ctx context.Context, _ Settings, cfg component.Config) (trace.TracerProvider, error) { + internal.WithTracerProvider(func(ctx context.Context, set Settings, cfg component.Config) (trace.TracerProvider, error) { c := *cfg.(*Config) - return newTracerProvider(ctx, c) + return newTracerProvider(ctx, set, c) }), ) } diff --git a/service/telemetry/tracer.go b/service/telemetry/tracer.go index d235ca3aaf2..85fd89e8c6a 100644 --- a/service/telemetry/tracer.go +++ b/service/telemetry/tracer.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/contrib/propagators/b3" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" + semconv "go.opentelemetry.io/otel/semconv/v1.26.0" "go.opentelemetry.io/otel/trace" ) @@ -25,11 +26,31 @@ var ( ) // New creates a new Telemetry from Config. -func newTracerProvider(ctx context.Context, cfg Config) (trace.TracerProvider, error) { +func newTracerProvider(ctx context.Context, set Settings, cfg Config) (trace.TracerProvider, error) { + attrs := map[string]interface{}{ + string(semconv.ServiceNameKey): set.BuildInfo.Version, + } + for k, v := range cfg.Resource { + if v != nil { + attrs[k] = *v + } + + // the new value is nil, delete the existing key + if _, ok := attrs[k]; ok && v == nil { + delete(attrs, k) + } + } + sch := semconv.SchemaURL + res := config.Resource{ + SchemaUrl: &sch, + Attributes: attrs, + } + sdk, err := config.NewSDK( config.WithContext(ctx), config.WithOpenTelemetryConfiguration( config.OpenTelemetryConfiguration{ + Resource: &res, TracerProvider: &config.TracerProvider{ Processors: cfg.Traces.Processors, // TODO: once https://github.com/open-telemetry/opentelemetry-configuration/issues/83 is resolved, From 6227646b0146bc09c4771298101c1362e0be61bd Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Fri, 12 Jul 2024 10:15:20 +0200 Subject: [PATCH 166/168] Promote confmap.strictlyTypedInput feature gate to beta (#10554) #### Description Makes type resolution strict and conforming to the behavior described in [the env vars RFC](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md) Depends on: - #10553 - #10555 - #10559 - open-telemetry/opentelemetry-collector-contrib/pull/33950 #### Link to tracking issue Fixes #9532, Fixes #8565 --------- Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .chloggen/mx-psi_enable-strict-types.yaml | 29 +++++++++++++++++++ confmap/expand_test.go | 6 ++-- confmap/internal/e2e/types_test.go | 8 +++++ exporter/otlpexporter/testdata/config.yaml | 2 +- .../otlphttpexporter/testdata/config.yaml | 2 +- internal/featuregates/featuregates.go | 2 +- otelcol/unmarshaler_test.go | 2 +- 7 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 .chloggen/mx-psi_enable-strict-types.yaml diff --git a/.chloggen/mx-psi_enable-strict-types.yaml b/.chloggen/mx-psi_enable-strict-types.yaml new file mode 100644 index 00000000000..518b740fecc --- /dev/null +++ b/.chloggen/mx-psi_enable-strict-types.yaml @@ -0,0 +1,29 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confmap + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Promote `confmap.strictlyTypedInput` feature gate to beta. + +# One or more tracking issues or pull requests related to the change +issues: [10552] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + This feature gate changes the following: + - Configurations relying on the implicit type casting behaviors listed on [#9532](https://github.com/open-telemetry/opentelemetry-collector/issues/9532) will start to fail. + - Configurations using URI expansion (i.e. `field: ${env:ENV}`) for string-typed fields will use the value passed in `ENV` verbatim without intermediate type casting. + + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/confmap/expand_test.go b/confmap/expand_test.go index 25f54496845..dd406922948 100644 --- a/confmap/expand_test.go +++ b/confmap/expand_test.go @@ -551,18 +551,18 @@ func TestResolverExpandUnsupportedScheme(t *testing.T) { func TestResolverExpandStringValueInvalidReturnValue(t *testing.T) { provider := newFakeProvider("input", func(context.Context, string, WatcherFunc) (*Retrieved, error) { - return NewRetrieved(map[string]any{"test": "localhost:${test:PORT}"}) + return NewRetrievedFromYAML([]byte(`test: "localhost:${test:PORT}"`)) }) testProvider := newFakeProvider("test", func(context.Context, string, WatcherFunc) (*Retrieved, error) { - return NewRetrieved([]any{1243}) + return NewRetrievedFromYAML([]byte("[1243]")) }) resolver, err := NewResolver(ResolverSettings{URIs: []string{"input:"}, ProviderFactories: []ProviderFactory{provider, testProvider}, ConverterFactories: nil}) require.NoError(t, err) _, err = resolver.Resolve(context.Background()) - assert.EqualError(t, err, `expanding ${test:PORT}: expected convertable to string value type, got ['ӛ']([]interface {})`) + assert.EqualError(t, err, `expanding ${test:PORT}: retrieved value does not have unambiguous string representation: [1243]`) } func TestResolverDefaultProviderExpand(t *testing.T) { diff --git a/confmap/internal/e2e/types_test.go b/confmap/internal/e2e/types_test.go index edd767f3ce4..e57d3f8af53 100644 --- a/confmap/internal/e2e/types_test.go +++ b/confmap/internal/e2e/types_test.go @@ -132,6 +132,14 @@ func TestTypeCasting(t *testing.T) { }, } + previousValue := featuregates.StrictlyTypedInputGate.IsEnabled() + err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, false) + require.NoError(t, err) + defer func() { + err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, previousValue) + require.NoError(t, err) + }() + for _, tt := range values { t.Run(tt.value+"/"+string(tt.targetField), func(t *testing.T) { testFile := "types_expand.yaml" diff --git a/exporter/otlpexporter/testdata/config.yaml b/exporter/otlpexporter/testdata/config.yaml index 7bc4bbe3f36..7716736b678 100644 --- a/exporter/otlpexporter/testdata/config.yaml +++ b/exporter/otlpexporter/testdata/config.yaml @@ -18,7 +18,7 @@ auth: authenticator: nop headers: "can you have a . here?": "F0000000-0000-0000-0000-000000000000" - header1: 234 + header1: "234" another: "somevalue" keepalive: time: 20s diff --git a/exporter/otlphttpexporter/testdata/config.yaml b/exporter/otlphttpexporter/testdata/config.yaml index a600a7bc9d6..410ff12a416 100644 --- a/exporter/otlphttpexporter/testdata/config.yaml +++ b/exporter/otlphttpexporter/testdata/config.yaml @@ -20,6 +20,6 @@ retry_on_failure: max_elapsed_time: 10m headers: "can you have a . here?": "F0000000-0000-0000-0000-000000000000" - header1: 234 + header1: "234" another: "somevalue" compression: gzip diff --git a/internal/featuregates/featuregates.go b/internal/featuregates/featuregates.go index aad444ab8bb..12aa6f851f9 100644 --- a/internal/featuregates/featuregates.go +++ b/internal/featuregates/featuregates.go @@ -13,7 +13,7 @@ var UseUnifiedEnvVarExpansionRules = featuregate.GlobalRegistry().MustRegister(" const StrictlyTypedInputID = "confmap.strictlyTypedInput" var StrictlyTypedInputGate = featuregate.GlobalRegistry().MustRegister(StrictlyTypedInputID, - featuregate.StageAlpha, + featuregate.StageBeta, featuregate.WithRegisterFromVersion("v0.103.0"), featuregate.WithRegisterDescription("Makes type casting rules during configuration unmarshaling stricter. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details."), ) diff --git a/otelcol/unmarshaler_test.go b/otelcol/unmarshaler_test.go index 18fd5f631db..4810b5e5bb9 100644 --- a/otelcol/unmarshaler_test.go +++ b/otelcol/unmarshaler_test.go @@ -128,7 +128,7 @@ func TestPipelineConfigUnmarshalError(t *testing.T) { }, }, }), - expectError: "'[traces].receivers[0]' has invalid keys: nop", + expectError: "'[traces].receivers': source data must be an array or slice, got map", }, } From 3087c5386a092c0d874ec0ee25a9ee2c2974b097 Mon Sep 17 00:00:00 2001 From: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Date: Fri, 12 Jul 2024 08:21:03 -0700 Subject: [PATCH 167/168] [otelcol] Obtain the Collector's effective configuration from `otelcol.Config` (#10139) #### Description The `otelcol.ConfmapProvider` interface accurately reports the config provided to the Collector by the user, but fails to effectively report the Collector's effective configuration. In particular, it misses: * Default values for fields in Config structs. * Transformations done to Config structs by their `Unmarshal` or `Validate` methods. * Custom marshaling of types after we know the type of the config. This is most obvious with `configopaque.String`, where we want these values to always be redacted when sent out of the Collector. I think we should attempt to get the Collector's effective configuration from `otelcol.Config` instead of using the map compiled by the confmap.Resolver. This also allows us to get rid of `otelcol.ConfmapProvider`. I have manually tested this using an OpAMP Supervisor setup, but wasn't able to add unit tests due to the way `otelcol.Collector` is written. --------- Co-authored-by: Pablo Baeyens --- .chloggen/better-effective-config.yaml | 25 ++++++++++++++++++++++++ .chloggen/deprecate-confmapprovider.yaml | 25 ++++++++++++++++++++++++ .chloggen/deprecate-getconfmap.yaml | 25 ++++++++++++++++++++++++ otelcol/collector.go | 17 ++++++---------- otelcol/collector_test.go | 18 ----------------- otelcol/configprovider.go | 7 ++++++- 6 files changed, 87 insertions(+), 30 deletions(-) create mode 100644 .chloggen/better-effective-config.yaml create mode 100644 .chloggen/deprecate-confmapprovider.yaml create mode 100644 .chloggen/deprecate-getconfmap.yaml diff --git a/.chloggen/better-effective-config.yaml b/.chloggen/better-effective-config.yaml new file mode 100644 index 00000000000..917f727bd9c --- /dev/null +++ b/.chloggen/better-effective-config.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Obtain the Collector's effective config from otelcol.Config + +# One or more tracking issues or pull requests related to the change +issues: [10139] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: "`otelcol.Collector` will now marshal `confmap.Conf` objects from `otelcol.Config` itself." + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/.chloggen/deprecate-confmapprovider.yaml b/.chloggen/deprecate-confmapprovider.yaml new file mode 100644 index 00000000000..b5f2bf1805a --- /dev/null +++ b/.chloggen/deprecate-confmapprovider.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate `otelcol.ConfmapProvider` + +# One or more tracking issues or pull requests related to the change +issues: [10139] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: "`otelcol.Collector` will now marshal `confmap.Conf` objects from `otelcol.Config` itself." + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/.chloggen/deprecate-getconfmap.yaml b/.chloggen/deprecate-getconfmap.yaml new file mode 100644 index 00000000000..016481095e2 --- /dev/null +++ b/.chloggen/deprecate-getconfmap.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate `(*otelcol.ConfigProvider).GetConfmap` + +# One or more tracking issues or pull requests related to the change +issues: [10139] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: Call `(*confmap.Conf).Marshal(*otelcol.Config)` to get the Collector's configuration. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/otelcol/collector.go b/otelcol/collector.go index 8f9839af6c8..b1d4705649c 100644 --- a/otelcol/collector.go +++ b/otelcol/collector.go @@ -163,17 +163,6 @@ func (col *Collector) Shutdown() { func (col *Collector) setupConfigurationComponents(ctx context.Context) error { col.setCollectorState(StateStarting) - var conf *confmap.Conf - - if cp, ok := col.configProvider.(ConfmapProvider); ok { - var err error - conf, err = cp.GetConfmap(ctx) - - if err != nil { - return fmt.Errorf("failed to resolve config: %w", err) - } - } - factories, err := col.set.Factories() if err != nil { return fmt.Errorf("failed to initialize factories: %w", err) @@ -189,6 +178,12 @@ func (col *Collector) setupConfigurationComponents(ctx context.Context) error { col.serviceConfig = &cfg.Service + conf := confmap.New() + + if err = conf.Marshal(cfg); err != nil { + return fmt.Errorf("could not marshal configuration: %w", err) + } + col.service, err = service.New(ctx, service.Settings{ BuildInfo: col.set.BuildInfo, CollectorConf: conf, diff --git a/otelcol/collector_test.go b/otelcol/collector_test.go index e1a2356a553..a2dc4083f5f 100644 --- a/otelcol/collector_test.go +++ b/otelcol/collector_test.go @@ -450,24 +450,6 @@ func TestCollectorDryRun(t *testing.T) { } } -func TestPassConfmapToServiceFailure(t *testing.T) { - set := CollectorSettings{ - BuildInfo: component.NewDefaultBuildInfo(), - Factories: nopFactories, - ConfigProviderSettings: ConfigProviderSettings{ - ResolverSettings: confmap.ResolverSettings{ - URIs: []string{filepath.Join("testdata", "otelcol-invalid.yaml")}, - ProviderFactories: []confmap.ProviderFactory{confmap.NewProviderFactory(newFailureProvider)}, - }, - }, - } - col, err := NewCollector(set) - require.NoError(t, err) - - err = col.Run(context.Background()) - require.Error(t, err) -} - func startCollector(ctx context.Context, t *testing.T, col *Collector) *sync.WaitGroup { wg := &sync.WaitGroup{} wg.Add(1) diff --git a/otelcol/configprovider.go b/otelcol/configprovider.go index 4b003a6fa39..344d86fb86a 100644 --- a/otelcol/configprovider.go +++ b/otelcol/configprovider.go @@ -58,6 +58,9 @@ type ConfigProvider interface { // // The purpose of this interface is that otelcol.ConfigProvider structs do not // necessarily need to use confmap.Conf as their underlying config structure. +// +// Deprecated: [v0.105.0] This interface is deprecated. otelcol.Collector will now obtain +// a confmap.Conf object from the unmarshaled config itself. type ConfmapProvider interface { // GetConfmap resolves the Collector's configuration and provides it as a confmap.Conf object. // @@ -70,7 +73,6 @@ type configProvider struct { } var _ ConfigProvider = (*configProvider)(nil) -var _ ConfmapProvider = (*configProvider)(nil) // ConfigProviderSettings are the settings to configure the behavior of the ConfigProvider. type ConfigProviderSettings struct { @@ -143,8 +145,11 @@ func (cm *configProvider) Shutdown(ctx context.Context) error { return cm.mapResolver.Shutdown(ctx) } +// Deprecated: [v0.105.0] Call `(*confmap.Conf).Marshal(*otelcol.Config)` to get +// the Collector's configuration instead. func (cm *configProvider) GetConfmap(ctx context.Context) (*confmap.Conf, error) { conf, err := cm.mapResolver.Resolve(ctx) + if err != nil { return nil, fmt.Errorf("cannot resolve the configuration: %w", err) } From 6fcebdbf64a8c7eb1c2f17501e93a04a8c19b540 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Fri, 12 Jul 2024 11:59:35 -0700 Subject: [PATCH 168/168] [chore] use macos-14 for arm testing (#10540) Similar to https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33921 --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/build-and-test-arm.yml | 9 ++++----- docs/platform-support.md | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml index 81bec877fcc..4a11d6ae764 100644 --- a/.github/workflows/build-and-test-arm.yml +++ b/.github/workflows/build-and-test-arm.yml @@ -1,9 +1,9 @@ name: build-and-test-arm on: push: - branches: [ main ] + branches: [main] tags: - - 'v[0-9]+.[0-9]+.[0-9]+*' + - "v[0-9]+.[0-9]+.[0-9]+*" merge_group: pull_request: env: @@ -11,7 +11,6 @@ env: # Make sure to exit early if cache segment download times out after 2 minutes. # We limit cache download as a whole to 5 minutes. SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 - GOPROXY: https://goproxy1.cncf.selfactuated.dev,direct permissions: contents: read @@ -24,7 +23,7 @@ concurrency: jobs: arm-unittest-matrix: if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }} - runs-on: actuated-arm64-4cpu-4gb + runs-on: macos-14 steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 @@ -50,7 +49,7 @@ jobs: run: make -j4 gotest arm-unittest: if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }} - runs-on: actuated-arm64-4cpu-4gb + runs-on: macos-14 needs: [arm-unittest-matrix] steps: - name: Print result diff --git a/docs/platform-support.md b/docs/platform-support.md index 288e7945938..edcd430357f 100644 --- a/docs/platform-support.md +++ b/docs/platform-support.md @@ -49,8 +49,8 @@ Tier 2 platforms are _guaranteed to work with specified limitations_. Precompile Tier 2 platforms are currently: | Platform | Owner(s) | |---------------|-------------------------------------------------------------------------------------------------------------| +| darwin/arm64 | [@MovieStoreGuy](https://github.com/MovieStoreGuy) | | windows/amd64 | [OpenTelemetry Collector approvers](https://github.com/open-telemetry/opentelemetry-collector#contributing) | -| linux/arm64 | [@atoulme](https://github.com/atoulme) | ### Tier 3 - Community Support @@ -61,9 +61,9 @@ Tier 3 platforms are currently: | Platform | Owner(s) | |---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------| | darwin/amd64 | [@h0cheung](https://github.com/h0cheung) | -| darwin/arm64 | [@MovieStoreGuy](https://github.com/MovieStoreGuy) | -| linux/386 | [@andrzej-stencel](https://github.com/andrzej-stencel) | +| linux/386 | [@andrzej-stencel](https://github.com/andrzej-stencel) | | linux/arm | [@Wal8800](https://github.com/Wal8800), [@atoulme](https://github.com/atoulme) | +| linux/arm64 | [@atoulme](https://github.com/atoulme) | | linux/ppc64le | [@IBM-Currency-Helper](https://github.com/IBM-Currency-Helper), [@adilhusain-s](https://github.com/adilhusain-s), [@seth-priya](https://github.com/seth-priya) | | linux/s390x | [@bwalk-at-ibm](https://github.com/bwalk-at-ibm), [@rrschulze](https://github.com/rrschulze) | | windows/386 | [@pjanotti](https://github.com/pjanotti) |