From 57f07626b88ea6140c0f6946c2e586de05d63021 Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Wed, 18 Oct 2023 16:23:16 +0100 Subject: [PATCH 1/7] Upgrade Agent to Collector 0.87 --- CHANGELOG.md | 10 + component/otelcol/auth/auth.go | 4 + component/otelcol/connector/connector.go | 4 + .../otelcol/connector/spanmetrics/types.go | 2 +- component/otelcol/exporter/exporter.go | 4 + component/otelcol/extension/extension.go | 4 + component/otelcol/processor/processor.go | 4 + component/otelcol/receiver/kafka/kafka.go | 125 +++-- .../prometheus/internal/appendable.go | 6 +- .../prometheus/internal/transaction.go | 6 +- .../prometheus/internal/transaction_test.go | 6 +- .../otelcol/receiver/prometheus/prometheus.go | 4 + component/otelcol/receiver/receiver.go | 4 + docs/developer/updating-otel.md | 3 + .../otelcol.exporter.loadbalancing.md | 18 +- ...otelcol.processor.probabilistic_sampler.md | 2 + .../components/otelcol.processor.transform.md | 38 +- .../components/otelcol.receiver.kafka.md | 18 + .../static/configuration/traces-config.md | 32 +- go.mod | 252 +++++---- go.sum | 523 +++++++++--------- pkg/traces/config.go | 22 +- .../servicegraphprocessor/processor_test.go | 5 + 23 files changed, 607 insertions(+), 489 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7762f4806c4e..fdfe8c15d0c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,11 @@ Main (unreleased) - Fix validation issue with ServiceMonitors when scrape timeout is greater than interval. (@captncraig) +- Static mode's spanmetrics processor will now prune histograms when the dimension cache is pruned. + Dimension cache was always pruned but histograms were not being pruned. This caused metric series + created by the spanmetrics processor to grow unbounded. Only static mode has this issue. Flow mode's + `otelcol.connector.spanmetrics` does not have this bug. (@nijave) + ### Enhancements - The `loki.write` WAL now has snappy compression enabled by default. (@thepalbi) @@ -75,6 +80,11 @@ Main (unreleased) - The `loki.source.docker` component now allows connecting to Docker daemons over HTTP(S) and setting up TLS credentials. (@tpaschalis) + +- Upgrade OpenTelemetry Collector packages to version 0.87 (@ptodev): + - `otelcol.receiver.kafka` has a new `header_extraction` block to extract headers from Kafka records. + - `otelcol.receiver.kafka` has a new `version` argument to change the version of + the SASL Protocol for SASL authentication. v0.37.2 (2023-10-16) ----------------- diff --git a/component/otelcol/auth/auth.go b/component/otelcol/auth/auth.go index 4e5f6f668d83..269c34e6d3eb 100644 --- a/component/otelcol/auth/auth.go +++ b/component/otelcol/auth/auth.go @@ -139,6 +139,10 @@ func (a *Auth) Update(args component.Arguments) error { TracerProvider: a.opts.Tracer, MeterProvider: metric.NewMeterProvider(metric.WithReader(promExporter)), + + ReportComponentStatus: func(*otelcomponent.StatusEvent) error { + return nil + }, }, BuildInfo: otelcomponent.BuildInfo{ diff --git a/component/otelcol/connector/connector.go b/component/otelcol/connector/connector.go index ae43cb67b5fb..0ae647e18494 100644 --- a/component/otelcol/connector/connector.go +++ b/component/otelcol/connector/connector.go @@ -149,6 +149,10 @@ func (p *Connector) Update(args component.Arguments) error { TracerProvider: p.opts.Tracer, MeterProvider: metric.NewMeterProvider(metric.WithReader(promExporter)), + + ReportComponentStatus: func(*otelcomponent.StatusEvent) error { + return nil + }, }, BuildInfo: otelcomponent.BuildInfo{ diff --git a/component/otelcol/connector/spanmetrics/types.go b/component/otelcol/connector/spanmetrics/types.go index c54b6eba51fc..bba03fbe047d 100644 --- a/component/otelcol/connector/spanmetrics/types.go +++ b/component/otelcol/connector/spanmetrics/types.go @@ -37,7 +37,7 @@ const ( // The unit is a private type in an internal Otel package, // so we need to convert it to a map and then back to the internal type. // ConvertMetricUnit matches the Unit type in this internal package: -// https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/connector/spanmetricsconnector/internal/metrics/unit.go +// https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/connector/spanmetricsconnector/internal/metrics/unit.go func ConvertMetricUnit(unit string) (map[string]interface{}, error) { switch unit { case MetricsUnitMilliseconds: diff --git a/component/otelcol/exporter/exporter.go b/component/otelcol/exporter/exporter.go index bcd74aee60cc..947e37ebec0d 100644 --- a/component/otelcol/exporter/exporter.go +++ b/component/otelcol/exporter/exporter.go @@ -140,6 +140,10 @@ func (e *Exporter) Update(args component.Arguments) error { TracerProvider: e.opts.Tracer, MeterProvider: metric.NewMeterProvider(metricOpts...), + + ReportComponentStatus: func(*otelcomponent.StatusEvent) error { + return nil + }, }, BuildInfo: otelcomponent.BuildInfo{ diff --git a/component/otelcol/extension/extension.go b/component/otelcol/extension/extension.go index 7997efde76bc..be0b62705b2f 100644 --- a/component/otelcol/extension/extension.go +++ b/component/otelcol/extension/extension.go @@ -116,6 +116,10 @@ func (e *Extension) Update(args component.Arguments) error { TracerProvider: e.opts.Tracer, MeterProvider: metric.NewMeterProvider(metric.WithReader(promExporter)), + + ReportComponentStatus: func(*otelcomponent.StatusEvent) error { + return nil + }, }, BuildInfo: otelcomponent.BuildInfo{ diff --git a/component/otelcol/processor/processor.go b/component/otelcol/processor/processor.go index b6601651826b..5bb4ebb1f0c2 100644 --- a/component/otelcol/processor/processor.go +++ b/component/otelcol/processor/processor.go @@ -135,6 +135,10 @@ func (p *Processor) Update(args component.Arguments) error { TracerProvider: p.opts.Tracer, MeterProvider: metric.NewMeterProvider(metric.WithReader(promExporter)), + + ReportComponentStatus: func(*otelcomponent.StatusEvent) error { + return nil + }, }, BuildInfo: otelcomponent.BuildInfo{ diff --git a/component/otelcol/receiver/kafka/kafka.go b/component/otelcol/receiver/kafka/kafka.go index 1e243fa9fc9b..2a41159b103b 100644 --- a/component/otelcol/receiver/kafka/kafka.go +++ b/component/otelcol/receiver/kafka/kafka.go @@ -9,6 +9,7 @@ import ( "github.com/grafana/agent/component/otelcol/receiver" otel_service "github.com/grafana/agent/service/otel" "github.com/grafana/river/rivertypes" + "github.com/mitchellh/mapstructure" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" otelcomponent "go.opentelemetry.io/collector/component" @@ -38,10 +39,11 @@ type Arguments struct { ClientID string `river:"client_id,attr,optional"` InitialOffset string `river:"initial_offset,attr,optional"` - Authentication AuthenticationArguments `river:"authentication,block,optional"` - Metadata MetadataArguments `river:"metadata,block,optional"` - AutoCommit AutoCommitArguments `river:"autocommit,block,optional"` - MessageMarking MessageMarkingArguments `river:"message_marking,block,optional"` + Authentication AuthenticationArguments `river:"authentication,block,optional"` + Metadata MetadataArguments `river:"metadata,block,optional"` + AutoCommit AutoCommitArguments `river:"autocommit,block,optional"` + MessageMarking MessageMarkingArguments `river:"message_marking,block,optional"` + HeaderExtraction HeaderExtraction `river:"header_extraction,block,optional"` // DebugMetrics configures component internal metrics. Optional. DebugMetrics otelcol.DebugMetricsArguments `river:"debug_metrics,block,optional"` @@ -79,6 +81,10 @@ var DefaultArguments = Arguments{ AfterExecution: false, IncludeUnsuccessful: false, }, + HeaderExtraction: HeaderExtraction{ + ExtractHeaders: false, + Headers: []string{}, + }, } // SetToDefault implements river.Defaulter. @@ -88,20 +94,28 @@ func (args *Arguments) SetToDefault() { // Convert implements receiver.Arguments. func (args Arguments) Convert() (otelcomponent.Config, error) { - return &kafkareceiver.Config{ - Brokers: args.Brokers, - ProtocolVersion: args.ProtocolVersion, - Topic: args.Topic, - Encoding: args.Encoding, - GroupID: args.GroupID, - ClientID: args.ClientID, - InitialOffset: args.InitialOffset, - - Authentication: args.Authentication.Convert(), - Metadata: args.Metadata.Convert(), - AutoCommit: args.AutoCommit.Convert(), - MessageMarking: args.MessageMarking.Convert(), - }, nil + input := make(map[string]interface{}) + input["auth"] = args.Authentication.Convert() + + var result kafkareceiver.Config + err := mapstructure.Decode(input, &result) + if err != nil { + return nil, err + } + + result.Brokers = args.Brokers + result.ProtocolVersion = args.ProtocolVersion + result.Topic = args.Topic + result.Encoding = args.Encoding + result.GroupID = args.GroupID + result.ClientID = args.ClientID + result.InitialOffset = args.InitialOffset + result.Metadata = args.Metadata.Convert() + result.AutoCommit = args.AutoCommit.Convert() + result.MessageMarking = args.MessageMarking.Convert() + result.HeaderExtraction = args.HeaderExtraction.Convert() + + return &result, nil } // Extensions implements receiver.Arguments. @@ -128,26 +142,26 @@ type AuthenticationArguments struct { } // Convert converts args into the upstream type. -func (args AuthenticationArguments) Convert() kafkaexporter.Authentication { - var res kafkaexporter.Authentication +func (args AuthenticationArguments) Convert() map[string]interface{} { + auth := make(map[string]interface{}) if args.Plaintext != nil { conv := args.Plaintext.Convert() - res.PlainText = &conv + auth["plain_text"] = &conv } if args.SASL != nil { conv := args.SASL.Convert() - res.SASL = &conv + auth["sasl"] = &conv } if args.TLS != nil { - res.TLS = args.TLS.Convert() + auth["tls"] = args.TLS.Convert() } if args.Kerberos != nil { conv := args.Kerberos.Convert() - res.Kerberos = &conv + auth["kerberos"] = &conv } - return res + return auth } // PlaintextArguments configures plaintext authentication against the Kafka @@ -158,10 +172,10 @@ type PlaintextArguments struct { } // Convert converts args into the upstream type. -func (args PlaintextArguments) Convert() kafkaexporter.PlainTextConfig { - return kafkaexporter.PlainTextConfig{ - Username: args.Username, - Password: string(args.Password), +func (args PlaintextArguments) Convert() map[string]interface{} { + return map[string]interface{}{ + "username": args.Username, + "password": string(args.Password), } } @@ -170,16 +184,18 @@ type SASLArguments struct { Username string `river:"username,attr"` Password rivertypes.Secret `river:"password,attr"` Mechanism string `river:"mechanism,attr"` + Version int `river:"version,attr,optional"` AWSMSK AWSMSKArguments `river:"aws_msk,block,optional"` } // Convert converts args into the upstream type. -func (args SASLArguments) Convert() kafkaexporter.SASLConfig { - return kafkaexporter.SASLConfig{ - Username: args.Username, - Password: string(args.Password), - Mechanism: args.Mechanism, - AWSMSK: args.AWSMSK.Convert(), +func (args SASLArguments) Convert() map[string]interface{} { + return map[string]interface{}{ + "username": args.Username, + "password": string(args.Password), + "mechanism": args.Mechanism, + "version": args.Version, + "aws_msk": args.AWSMSK.Convert(), } } @@ -191,10 +207,10 @@ type AWSMSKArguments struct { } // Convert converts args into the upstream type. -func (args AWSMSKArguments) Convert() kafkaexporter.AWSMSKConfig { - return kafkaexporter.AWSMSKConfig{ - Region: args.Region, - BrokerAddr: args.BrokerAddr, +func (args AWSMSKArguments) Convert() map[string]interface{} { + return map[string]interface{}{ + "region": args.Region, + "broker_addr": args.BrokerAddr, } } @@ -211,15 +227,15 @@ type KerberosArguments struct { } // Convert converts args into the upstream type. -func (args KerberosArguments) Convert() kafkaexporter.KerberosConfig { - return kafkaexporter.KerberosConfig{ - ServiceName: args.ServiceName, - Realm: args.Realm, - UseKeyTab: args.UseKeyTab, - Username: args.Username, - Password: string(args.Password), - ConfigPath: args.ConfigPath, - KeyTabPath: args.KeyTabPath, +func (args KerberosArguments) Convert() map[string]interface{} { + return map[string]interface{}{ + "service_name": args.ServiceName, + "realm": args.Realm, + "use_keytab": args.UseKeyTab, + "username": args.Username, + "password": string(args.Password), + "config_file": args.ConfigPath, + "keytab_file": args.KeyTabPath, } } @@ -283,6 +299,19 @@ func (args MessageMarkingArguments) Convert() kafkareceiver.MessageMarking { } } +type HeaderExtraction struct { + ExtractHeaders bool `river:"extract_headers,attr,optional"` + Headers []string `river:"headers,attr,optional"` +} + +// Convert converts HeaderExtraction into the upstream type. +func (h HeaderExtraction) Convert() kafkareceiver.HeaderExtraction { + return kafkareceiver.HeaderExtraction{ + ExtractHeaders: h.ExtractHeaders, + Headers: h.Headers, + } +} + // DebugMetricsConfig implements receiver.Arguments. func (args Arguments) DebugMetricsConfig() otelcol.DebugMetricsArguments { return args.DebugMetrics diff --git a/component/otelcol/receiver/prometheus/internal/appendable.go b/component/otelcol/receiver/prometheus/internal/appendable.go index e709bf41a336..bbcf6b9ab055 100644 --- a/component/otelcol/receiver/prometheus/internal/appendable.go +++ b/component/otelcol/receiver/prometheus/internal/appendable.go @@ -23,8 +23,8 @@ import ( "github.com/prometheus/prometheus/storage" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receiverhelper" ) // appendable translates Prometheus scraping diffs into OpenTelemetry format. @@ -36,7 +36,7 @@ type appendable struct { externalLabels labels.Labels settings receiver.CreateSettings - obsrecv *obsreport.Receiver + obsrecv *receiverhelper.ObsReport } // NewAppendable returns a storage.Appendable instance that emits metrics to the sink. @@ -56,7 +56,7 @@ func NewAppendable( metricAdjuster = NewStartTimeMetricAdjuster(set.Logger, startTimeMetricRegex) } - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverID: receiverID, Transport: transport, ReceiverCreateSettings: set}) + obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ReceiverID: receiverID, Transport: transport, ReceiverCreateSettings: set}) if err != nil { return nil, err } diff --git a/component/otelcol/receiver/prometheus/internal/transaction.go b/component/otelcol/receiver/prometheus/internal/transaction.go index f584a1120948..d942e2947d57 100644 --- a/component/otelcol/receiver/prometheus/internal/transaction.go +++ b/component/otelcol/receiver/prometheus/internal/transaction.go @@ -29,10 +29,10 @@ import ( "github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/storage" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receiverhelper" "go.uber.org/zap" ) @@ -50,7 +50,7 @@ type transaction struct { nodeResource pcommon.Resource logger *zap.Logger metricAdjuster MetricsAdjuster - obsrecv *obsreport.Receiver + obsrecv *receiverhelper.ObsReport } func newTransaction( @@ -59,7 +59,7 @@ func newTransaction( sink consumer.Metrics, externalLabels labels.Labels, settings receiver.CreateSettings, - obsrecv *obsreport.Receiver) *transaction { + obsrecv *receiverhelper.ObsReport) *transaction { return &transaction{ ctx: ctx, diff --git a/component/otelcol/receiver/prometheus/internal/transaction_test.go b/component/otelcol/receiver/prometheus/internal/transaction_test.go index deb47ff989d5..279093185a95 100644 --- a/component/otelcol/receiver/prometheus/internal/transaction_test.go +++ b/component/otelcol/receiver/prometheus/internal/transaction_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/receivertest" ) @@ -189,8 +189,8 @@ func TestTransactionAppendSummaryNoQuantile(t *testing.T) { require.ErrorIs(t, err, errEmptyQuantileLabel) } -func nopObsRecv(t *testing.T) *obsreport.Receiver { - res, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ +func nopObsRecv(t *testing.T) *receiverhelper.ObsReport { + res, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: component.NewID("prometheus"), Transport: transport, ReceiverCreateSettings: receivertest.NewNopCreateSettings(), diff --git a/component/otelcol/receiver/prometheus/prometheus.go b/component/otelcol/receiver/prometheus/prometheus.go index 4594e6192e36..7928f504287b 100644 --- a/component/otelcol/receiver/prometheus/prometheus.go +++ b/component/otelcol/receiver/prometheus/prometheus.go @@ -111,6 +111,10 @@ func (c *Component) Update(newConfig component.Arguments) error { // TODO(tpaschalis): expose tracing and logging statistics. TracerProvider: trace.NewNoopTracerProvider(), MeterProvider: noop.NewMeterProvider(), + + ReportComponentStatus: func(*otelcomponent.StatusEvent) error { + return nil + }, }, BuildInfo: otelcomponent.BuildInfo{ diff --git a/component/otelcol/receiver/receiver.go b/component/otelcol/receiver/receiver.go index 6e76c1591e89..0c3943fb8c0c 100644 --- a/component/otelcol/receiver/receiver.go +++ b/component/otelcol/receiver/receiver.go @@ -133,6 +133,10 @@ func (r *Receiver) Update(args component.Arguments) error { TracerProvider: r.opts.Tracer, MeterProvider: metric.NewMeterProvider(metricOpts...), + + ReportComponentStatus: func(*otelcomponent.StatusEvent) error { + return nil + }, }, BuildInfo: otelcomponent.BuildInfo{ diff --git a/docs/developer/updating-otel.md b/docs/developer/updating-otel.md index e67db2fc8499..6b59e6d805bc 100644 --- a/docs/developer/updating-otel.md +++ b/docs/developer/updating-otel.md @@ -39,6 +39,7 @@ Unfortunately, updating Otel dependencies is not straightforward: 2. Check which branch of the fork repo the Agent currently uses. 3. See what commits were pushed onto that branch to customize it. 4. Create a PR to cherry-pick the same commits to the new branch. See the [changes to the 0.85 branch](https://github.com/grafana/opentelemetry-collector/pull/8) for an example PR. +5. Run `make` on the branch to make sure it builds and that the tests pass. ### Update the Agent's dependencies @@ -80,6 +81,8 @@ Unfortunately, updating Otel dependencies is not straightforward: have new parameters which have been added to the Otel components recently. If you do think it should be updated, check with the rest of the team on whether it is really necessary. + * Search the Agent repository for the old version (e.g. "0.87") to find code and + documentation which also needs updating. 5. Some Agent components reuse OpenTelemetry code, but do not import it: * `otelcol.extension.jaeger_remote_sampling`: a lot of this code has been copy-pasted from Otel and modified slightly to fit the Agent's needs. diff --git a/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md b/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md index 9b9073dc6501..e3279fd5f6cd 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md @@ -65,10 +65,20 @@ Name | Type | Description | Default | Required `routing_key` | `string` | Routing strategy for load balancing. | `"traceID"` | no The `routing_key` attribute determines how to route signals across endpoints. Its value could be one of the following: -* `"service"`: spans with the same `service.name` will be exported to the same backend. -This is useful when using processors like the span metrics, so all spans for each service are sent to consistent Agent instances -for metric collection. Otherwise, metrics for the same services would be sent to different Agents, making aggregations inaccurate. -* `"traceID"`: spans belonging to the same traceID will be exported to the same backend. +* `"service"`: + * Works for logs, spans, and metrics. + * Signals with the same `service.name` will be exported to the same backend. + This is useful when using processors like the span metrics, so all spans for each service are sent to consistent Agent instances + for metric collection. Otherwise, metrics for the same services would be sent to different Agents, making aggregations inaccurate. +* `"traceID"`: + * Works for logs and spans. + * Signals belonging to the same traceID will be exported to the same backend. +* `"resource"`: + * Works for metrics. + * Signals with the same metric name and the same resource attributes will be exported to the same backend. +* `"metric"`: + * Works for metrics. + * Signals with the same metric name will be exported to the same backend. ## Blocks diff --git a/docs/sources/flow/reference/components/otelcol.processor.probabilistic_sampler.md b/docs/sources/flow/reference/components/otelcol.processor.probabilistic_sampler.md index 0a37152bf586..32bbd8bd15a9 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.probabilistic_sampler.md +++ b/docs/sources/flow/reference/components/otelcol.processor.probabilistic_sampler.md @@ -8,6 +8,8 @@ description: Learn about telcol.processor.probabilistic_sampler # otelcol.processor.probabilistic_sampler +{{< docs/shared lookup="flow/stability/experimental.md" source="agent" version="" >}} + `otelcol.processor.probabilistic_sampler` accepts logs and traces data from other otelcol components and applies probabilistic sampling based on configuration options. {{% admonition type="note" %}} diff --git a/docs/sources/flow/reference/components/otelcol.processor.transform.md b/docs/sources/flow/reference/components/otelcol.processor.transform.md index 60aaa3fee27b..563fdc016954 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.transform.md +++ b/docs/sources/flow/reference/components/otelcol.processor.transform.md @@ -73,9 +73,9 @@ to a new metric data type or can be used to create new metrics. - [Orphaned Telemetry][]: The processor allows you to modify `span_id`, `trace_id`, and `parent_span_id` for traces and `span_id`, and `trace_id` logs. Modifying these fields could lead to orphaned spans or logs. -[Unsound Transformations]: https://github.com/open-telemetry/opentelemetry-collector/blob/v0.85.0/docs/standard-warnings.md#unsound-transformations -[Identity Conflict]: https://github.com/open-telemetry/opentelemetry-collector/blob/v0.85.0/docs/standard-warnings.md#identity-conflict -[Orphaned Telemetry]: https://github.com/open-telemetry/opentelemetry-collector/blob/v0.85.0/docs/standard-warnings.md#orphaned-telemetry +[Unsound Transformations]: https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/docs/standard-warnings.md#unsound-transformations +[Identity Conflict]: https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/docs/standard-warnings.md#identity-conflict +[Orphaned Telemetry]: https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/docs/standard-warnings.md#orphaned-telemetry [no-op]: https://en.wikipedia.org/wiki/NOP_(code) [metrics data model]: https://github.com/open-telemetry/opentelemetry-specification/blob/main//specification/metrics/data-model.md {{% /admonition %}} @@ -557,19 +557,19 @@ Some values in the River strings are [escaped][river-strings]: [logs protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v0.17.0/opentelemetry/proto/logs/v1/logs.proto -[OTTL]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/pkg/ottl/README.md -[OTTL functions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/pkg/ottl/ottlfuncs/README.md -[convert_sum_to_gauge]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/transformprocessor#convert_sum_to_gauge -[convert_gauge_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/transformprocessor#convert_gauge_to_sum -[convert_summary_count_val_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/transformprocessor#convert_summary_count_val_to_sum -[convert_summary_sum_val_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/transformprocessor#convert_summary_sum_val_to_sum -[OTTL booleans]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/pkg/ottl#booleans -[OTTL math expressions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/pkg/ottl#math-expressions -[OTTL boolean expressions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/pkg/ottl#boolean-expressions -[OTTL resource context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/pkg/ottl/contexts/ottlresource/README.md -[OTTL scope context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/pkg/ottl/contexts/ottlscope/README.md -[OTTL span context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/pkg/ottl/contexts/ottlspan/README.md -[OTTL spanevent context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/pkg/ottl/contexts/ottlspanevent/README.md -[OTTL metric context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/pkg/ottl/contexts/ottlmetric/README.md -[OTTL datapoint context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/pkg/ottl/contexts/ottldatapoint/README.md -[OTTL log context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/pkg/ottl/contexts/ottllog/README.md +[OTTL]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/README.md +[OTTL functions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/ottlfuncs/README.md +[convert_sum_to_gauge]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/transformprocessor#convert_sum_to_gauge +[convert_gauge_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/transformprocessor#convert_gauge_to_sum +[convert_summary_count_val_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/transformprocessor#convert_summary_count_val_to_sum +[convert_summary_sum_val_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/transformprocessor#convert_summary_sum_val_to_sum +[OTTL booleans]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/pkg/ottl#booleans +[OTTL math expressions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/pkg/ottl#math-expressions +[OTTL boolean expressions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/pkg/ottl#boolean-expressions +[OTTL resource context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlresource/README.md +[OTTL scope context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlscope/README.md +[OTTL span context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlspan/README.md +[OTTL spanevent context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlspanevent/README.md +[OTTL metric context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlmetric/README.md +[OTTL datapoint context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottldatapoint/README.md +[OTTL log context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottllog/README.md diff --git a/docs/sources/flow/reference/components/otelcol.receiver.kafka.md b/docs/sources/flow/reference/components/otelcol.receiver.kafka.md index 934f86dc9f48..aa45d353f90d 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.kafka.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.kafka.md @@ -87,6 +87,7 @@ metadata | [metadata][] | Configures how to retrieve metadata from Kafka brokers metadata > retry | [retry][] | Configures how to retry metadata retrieval. | no autocommit | [autocommit][] | Configures how to automatically commit updated topic offsets to back to the Kafka brokers. | no message_marking | [message_marking][] | Configures when Kafka messages are marked as read. | no +header_extraction | [header_extraction][] | Extract headers from Kafka records. | no debug_metrics | [debug_metrics][] | Configures the metrics which this component generates to monitor its state. | no output | [output][] | Configures where to send received telemetry data. | yes @@ -104,6 +105,7 @@ The `>` symbol indicates deeper levels of nesting. For example, [retry]: #retry-block [autocommit]: #autocommit-block [message_marking]: #message_marking-block +[header_extraction]: #header_extraction-block [debug_metrics]: #debug_metrics-block [output]: #output-block @@ -135,6 +137,7 @@ Name | Type | Description | Default | Required `username` | `string` | Username to use for SASL authentication. | | yes `password` | `secret` | Password to use for SASL authentication. | | yes `mechanism` | `string` | SASL mechanism to use when authenticating. | | yes +`version` | `number` | Version of the SASL Protocol to use when authenticating. | `0` | no The `mechanism` argument can be set to one of the following strings: @@ -145,6 +148,8 @@ The `mechanism` argument can be set to one of the following strings: When `mechanism` is set to `"AWS_MSK_IAM"`, the [`aws_msk` child block][aws_msk] must also be provided. +The `version` argument can be set to either `0` or `1`. + ### aws_msk block The `aws_msk` block configures extra parameters for SASL authentication when @@ -258,6 +263,19 @@ has no effect if `after_execution` is `false`. > to `false` can block the entire Kafka partition if message processing returns > a permanent error, such as failing to decode. +### header_extraction block + +The `header_extraction` block configures how to extract headers from Kafka records. + +The following arguments are supported: + +Name | Type | Description | Default | Required +---- | ---- | ----------- | ------- | -------- +`extract_headers` | `bool` | Enables attaching header fields to resource attributes. | `false` | no +`headers` | `list(string)` | A list of headers to extract from the Kafka record. | `[]]` | no + +Regular expressions are not allowed in the `headers` argument. Only exact matching will be performed. + ### debug_metrics block {{< docs/shared lookup="flow/reference/components/otelcol-debug-metrics-block.md" source="agent" version="" >}} diff --git a/docs/sources/static/configuration/traces-config.md b/docs/sources/static/configuration/traces-config.md index 6e8537a2c0a2..75a89cd32e50 100644 --- a/docs/sources/static/configuration/traces-config.md +++ b/docs/sources/static/configuration/traces-config.md @@ -80,7 +80,7 @@ remote_write: # Configures opentelemetry exporters to use the OpenTelemetry auth extension `oauth2clientauthextension`. # Can not be used in combination with `basic_auth`. - # See https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/extension/oauth2clientauthextension/README.md + # See https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/extension/oauth2clientauthextension/README.md oauth2: # Configures the TLS settings specific to the oauth2 client # The client identifier issued to the oauth client @@ -96,7 +96,7 @@ remote_write: # Optional, specifies the timeout fetching tokens from the token_url. Default: no timeout [ timeout: ] # TLS client configuration for the underneath client to authorization server. - # https://github.com/open-telemetry/opentelemetry-collector/blob/v0.85.0/config/configtls/README.md + # https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/config/configtls/README.md tls: # Disable validation of the server certificate. [ insecure: | default = false ] @@ -191,7 +191,7 @@ automatic_logging: # Receiver configurations are mapped directly into the OpenTelemetry receivers # block. At least one receiver is required. -# The Agent uses OpenTelemetry v0.85.0. Refer to the corresponding receiver's config. +# The Agent uses OpenTelemetry v0.87.0. Refer to the corresponding receiver's config. # # Supported receivers: otlp, jaeger, kafka, opencensus and zipkin. receivers: @@ -419,7 +419,7 @@ service_graphs: # jaeger_remote_sampling configures one or more jaeger remote sampling extensions. # For more details about the configuration please consult the OpenTelemetry documentation: -# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/extension/jaegerremotesampling +# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/extension/jaegerremotesampling # # Example config: # @@ -439,17 +439,17 @@ jaeger_remote_sampling: More information on the following types can be found on the documentation for their respective projects: -* [`attributes.config`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/attributesprocessor) -* [`batch.config`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.85.0/processor/batchprocessor) -* [`otlpexporter.sending_queue`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.85.0/exporter/otlpexporter) -* [`otlpexporter.retry_on_failure`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.85.0/exporter/otlpexporter) +* [`attributes.config`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/attributesprocessor) +* [`batch.config`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/processor/batchprocessor) +* [`otlpexporter.sending_queue`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/exporter/otlpexporter) +* [`otlpexporter.retry_on_failure`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/exporter/otlpexporter) * `receivers`: - * [`jaegerreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/receiver/jaegerreceiver) - * [`kafkareceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/receiver/kafkareceiver) - * [`otlpreceiver`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.85.0/receiver/otlpreceiver) - * [`opencensusreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/receiver/opencensusreceiver) - * [`zipkinreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/receiver/zipkinreceiver) + * [`jaegerreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/receiver/jaegerreceiver) + * [`kafkareceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/receiver/kafkareceiver) + * [`otlpreceiver`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/receiver/otlpreceiver) + * [`opencensusreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/receiver/opencensusreceiver) + * [`zipkinreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/receiver/zipkinreceiver) * [`scrape_config`: Prometheus](https://prometheus.io/docs/prometheus/2.45/configuration/configuration/#scrape_config) -* [`spanmetricsprocessor.latency_histogram_buckets`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/processor/spanmetricsprocessor/config.go#L37-L39) -* [`spanmetricsprocessor.dimensions`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.85.0/processor/spanmetricsprocessor/config.go#L41-L48) -* [`tailsamplingprocessor.policies`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/tailsamplingprocessor) +* [`spanmetricsprocessor.latency_histogram_buckets`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/processor/spanmetricsprocessor/config.go#L37-L39) +* [`spanmetricsprocessor.dimensions`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/processor/spanmetricsprocessor/config.go#L41-L48) +* [`tailsamplingprocessor.policies`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/tailsamplingprocessor) diff --git a/go.mod b/go.mod index 8c42b2062bca..92e101f1c7df 100644 --- a/go.mod +++ b/go.mod @@ -7,15 +7,15 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 github.com/Azure/go-autorest/autorest v0.11.29 - github.com/IBM/sarama v1.41.1 + github.com/IBM/sarama v1.41.2 github.com/Lusitaniae/apache_exporter v0.11.1-0.20220518131644-f9522724dab4 github.com/Masterminds/sprig/v3 v3.2.3 github.com/PuerkitoBio/rehttp v1.1.0 github.com/alecthomas/kingpin/v2 v2.3.2 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 - github.com/aws/aws-sdk-go v1.45.2 - github.com/aws/aws-sdk-go-v2 v1.21.0 - github.com/aws/aws-sdk-go-v2/config v1.18.38 + github.com/aws/aws-sdk-go v1.45.24 + github.com/aws/aws-sdk-go-v2 v1.21.1 + github.com/aws/aws-sdk-go-v2/config v1.18.44 github.com/aws/aws-sdk-go-v2/service/s3 v1.34.1 github.com/bmatcuk/doublestar v1.3.4 github.com/bufbuild/connect-go v1.9.0 @@ -26,7 +26,7 @@ require ( github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/coreos/go-systemd/v22 v22.5.0 github.com/davidmparrott/kafka_exporter/v2 v2.0.1 - github.com/docker/docker v24.0.5+incompatible + github.com/docker/docker v24.0.6+incompatible github.com/docker/go-connections v0.4.0 github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 github.com/fatih/color v1.15.0 @@ -66,7 +66,7 @@ require ( github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0 github.com/grafana/vmware_exporter v0.0.4-beta github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 - github.com/hashicorp/consul/api v1.24.0 + github.com/hashicorp/consul/api v1.25.1 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-discover v0.0.0-20220105235006-b95dfa40aaed github.com/hashicorp/go-multierror v1.1.1 @@ -86,7 +86,7 @@ require ( github.com/jaegertracing/jaeger v1.48.0 github.com/jmespath/go-jmespath v0.4.0 github.com/json-iterator/go v1.1.12 - github.com/klauspost/compress v1.16.7 + github.com/klauspost/compress v1.17.0 github.com/lib/pq v1.10.7 github.com/mackerelio/go-osstat v0.2.3 github.com/miekg/dns v1.1.55 @@ -100,32 +100,32 @@ require ( github.com/oklog/run v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/oliver006/redis_exporter v1.54.0 - github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.85.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.87.0 github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e github.com/opentracing-contrib/go-stdlib v1.0.0 github.com/opentracing/opentracing-go v1.2.0 @@ -144,7 +144,7 @@ require ( github.com/prometheus-operator/prometheus-operator/pkg/client v0.66.0 github.com/prometheus/blackbox_exporter v0.24.1-0.20230623125439-bd22efa1c900 github.com/prometheus/client_golang v1.17.0 - github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 + github.com/prometheus/client_model v0.5.0 github.com/prometheus/common v0.44.0 github.com/prometheus/consul_exporter v0.8.0 github.com/prometheus/memcached_exporter v0.13.0 @@ -155,14 +155,14 @@ require ( github.com/prometheus/snmp_exporter v0.24.1 github.com/prometheus/statsd_exporter v0.22.8 github.com/richardartoul/molecule v1.0.1-0.20221107223329-32cfee06a052 - github.com/rs/cors v1.10.0 - github.com/shirou/gopsutil/v3 v3.23.8 + github.com/rs/cors v1.10.1 + github.com/shirou/gopsutil/v3 v3.23.9 github.com/sijms/go-ora/v2 v2.7.3 github.com/sirupsen/logrus v1.9.3 github.com/spaolacci/murmur3 v1.1.0 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 - github.com/testcontainers/testcontainers-go v0.23.0 + github.com/testcontainers/testcontainers-go v0.25.0 github.com/testcontainers/testcontainers-go/modules/k3s v0.0.0-20230615142642-c175df34bd1d github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/vincent-petithory/dataurl v1.0.0 @@ -171,72 +171,74 @@ require ( github.com/wk8/go-ordered-map v0.2.0 github.com/xdg-go/scram v1.1.2 github.com/zeebo/xxh3 v1.0.2 - go.opentelemetry.io/collector v0.85.0 - go.opentelemetry.io/collector/component v0.85.0 - go.opentelemetry.io/collector/config/configauth v0.85.0 - go.opentelemetry.io/collector/config/configcompression v0.85.0 - go.opentelemetry.io/collector/config/configgrpc v0.85.0 - go.opentelemetry.io/collector/config/confighttp v0.85.0 - go.opentelemetry.io/collector/config/confignet v0.85.0 - go.opentelemetry.io/collector/config/configopaque v0.85.0 - go.opentelemetry.io/collector/config/configtelemetry v0.85.0 - go.opentelemetry.io/collector/config/configtls v0.85.0 - go.opentelemetry.io/collector/confmap v0.85.0 - go.opentelemetry.io/collector/connector v0.85.0 - go.opentelemetry.io/collector/consumer v0.85.0 - go.opentelemetry.io/collector/exporter v0.85.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.85.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.85.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.85.0 - go.opentelemetry.io/collector/extension v0.85.0 - go.opentelemetry.io/collector/extension/auth v0.85.0 - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/processor v0.85.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.85.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.85.0 - go.opentelemetry.io/collector/receiver v0.85.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.85.0 - go.opentelemetry.io/collector/semconv v0.85.0 + go.opentelemetry.io/collector v0.87.0 + go.opentelemetry.io/collector/component v0.87.0 + go.opentelemetry.io/collector/config/configauth v0.87.0 + go.opentelemetry.io/collector/config/configcompression v0.87.0 + go.opentelemetry.io/collector/config/configgrpc v0.87.0 + go.opentelemetry.io/collector/config/confighttp v0.87.0 + go.opentelemetry.io/collector/config/confignet v0.87.0 + go.opentelemetry.io/collector/config/configopaque v0.87.0 + go.opentelemetry.io/collector/config/configtelemetry v0.87.0 + go.opentelemetry.io/collector/config/configtls v0.87.0 + go.opentelemetry.io/collector/confmap v0.87.0 + go.opentelemetry.io/collector/connector v0.87.0 + go.opentelemetry.io/collector/consumer v0.87.0 + go.opentelemetry.io/collector/exporter v0.87.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.87.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.87.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.87.0 + go.opentelemetry.io/collector/extension v0.87.0 + go.opentelemetry.io/collector/extension/auth v0.87.0 + go.opentelemetry.io/collector/featuregate v1.0.0-rcv0016 + go.opentelemetry.io/collector/otelcol v0.87.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 + go.opentelemetry.io/collector/processor v0.87.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.87.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.87.0 + go.opentelemetry.io/collector/receiver v0.87.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.87.0 + go.opentelemetry.io/collector/semconv v0.87.0 + go.opentelemetry.io/collector/service v0.87.0 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0 go.opentelemetry.io/otel v1.19.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 - go.opentelemetry.io/otel/exporters/prometheus v0.40.1-0.20230831181707-02616a25c68e + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 + go.opentelemetry.io/otel/exporters/prometheus v0.42.0 go.opentelemetry.io/otel/metric v1.19.0 - go.opentelemetry.io/otel/sdk v1.17.0 - go.opentelemetry.io/otel/sdk/metric v0.40.0 + go.opentelemetry.io/otel/sdk v1.19.0 + go.opentelemetry.io/otel/sdk/metric v1.19.0 go.opentelemetry.io/otel/trace v1.19.0 go.opentelemetry.io/proto/otlp v1.0.0 go.uber.org/atomic v1.11.0 go.uber.org/goleak v1.2.1 go.uber.org/multierr v1.11.0 - go.uber.org/zap v1.25.0 + go.uber.org/zap v1.26.0 golang.org/x/crypto v0.14.0 golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 golang.org/x/net v0.17.0 - golang.org/x/oauth2 v0.11.0 + golang.org/x/oauth2 v0.13.0 golang.org/x/sys v0.13.0 golang.org/x/text v0.13.0 golang.org/x/time v0.3.0 - google.golang.org/api v0.139.0 + google.golang.org/api v0.146.0 google.golang.org/grpc v1.58.3 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools v2.2.0+incompatible - k8s.io/api v0.28.1 + k8s.io/api v0.28.2 k8s.io/apiextensions-apiserver v0.28.0 - k8s.io/apimachinery v0.28.1 - k8s.io/client-go v0.28.1 + k8s.io/apimachinery v0.28.2 + k8s.io/client-go v0.28.2 k8s.io/component-base v0.28.1 k8s.io/klog/v2 v2.100.1 k8s.io/utils v0.0.0-20230711102312-30195339c3c7 - sigs.k8s.io/controller-runtime v0.16.1 + sigs.k8s.io/controller-runtime v0.16.2 sigs.k8s.io/yaml v1.3.0 ) require ( - cloud.google.com/go v0.110.6 // indirect + cloud.google.com/go v0.110.7 // indirect cloud.google.com/go/compute v1.23.0 // indirect cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect cloud.google.com/go/iam v1.1.1 // indirect @@ -270,14 +272,14 @@ require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.2.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/Microsoft/hcsshim v0.10.0-rc.8 // indirect + github.com/Microsoft/hcsshim v0.11.0 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7 // indirect github.com/acomagu/bufpipe v1.0.3 // indirect - github.com/alecthomas/participle/v2 v2.0.0 // indirect + github.com/alecthomas/participle/v2 v2.1.0 // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/andybalholm/brotli v1.0.5 // indirect - github.com/antonmedv/expr v1.15.0 // indirect + github.com/antonmedv/expr v1.15.3 // indirect github.com/apache/arrow/go/v12 v12.0.1 // indirect github.com/apache/thrift v0.19.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect @@ -285,21 +287,21 @@ require ( github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/avvmoto/buf-readerat v0.0.0-20171115124131-a17c8cb89270 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.36 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.69 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.13.6 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 // indirect - github.com/aws/smithy-go v1.14.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect + github.com/aws/smithy-go v1.15.0 // indirect github.com/beevik/ntp v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.2-0.20180723201105-3c1074078d32+incompatible // indirect @@ -315,8 +317,8 @@ require ( github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect github.com/containerd/cgroups v1.1.0 // indirect github.com/containerd/console v1.0.3 // indirect - github.com/containerd/containerd v1.7.3 // indirect - github.com/containerd/continuity v0.4.1 // indirect + github.com/containerd/containerd v1.7.6 // indirect + github.com/containerd/continuity v0.4.2 // indirect github.com/containerd/ttrpc v1.2.2 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/cpuguy83/dockercfg v0.3.1 // indirect @@ -391,7 +393,7 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.5.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -399,7 +401,7 @@ require ( github.com/grafana/gomemcache v0.0.0-20230316202710-a081dae0aba9 // indirect github.com/grafana/loki/pkg/push v0.0.0-20230904153656-e4cc2a4f5ec8 // k166 branch github.com/grobie/gomemcache v0.0.0-20230213081705-239240bbc445 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/cronexpr v1.1.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -494,22 +496,22 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/montanaflynn/stats v0.7.0 // indirect github.com/morikuni/aec v1.0.0 // indirect - github.com/mostynb/go-grpc-compression v1.2.0 // indirect + github.com/mostynb/go-grpc-compression v1.2.1 // indirect github.com/mrunalp/fileutils v0.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833 // indirect github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect github.com/oklog/ulid v1.3.1 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.85.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.85.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.85.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.85.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.85.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.85.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.85.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.85.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.87.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc4 // indirect github.com/opencontainers/runc v1.1.9 // indirect @@ -587,23 +589,23 @@ require ( go.etcd.io/etcd/client/v3 v3.5.9 // indirect go.mongodb.org/mongo-driver v1.12.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/internal v0.85.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v0.40.0 // indirect + go.opentelemetry.io/collector/config/internal v0.87.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.19.0 // indirect + go.opentelemetry.io/otel/bridge/opencensus v0.42.0 // indirect go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect - golang.org/x/mod v0.12.0 // indirect - golang.org/x/sync v0.3.0 // indirect + golang.org/x/mod v0.13.0 // indirect + golang.org/x/sync v0.4.0 // indirect golang.org/x/term v0.13.0 // indirect - golang.org/x/tools v0.12.0 // indirect + golang.org/x/tools v0.14.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -633,19 +635,20 @@ require ( github.com/leoluk/perflib_exporter v0.2.0 // indirect github.com/lightstep/go-expohisto v1.0.0 // indirect github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.85.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.87.0 // indirect github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/prometheus-community/prom-label-proxy v0.6.0 // indirect github.com/sercand/kuberesolver/v4 v4.0.0 // indirect github.com/sony/gobreaker v0.5.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0 // indirect ) // NOTE: replace directives below must always be *temporary*. @@ -723,7 +726,10 @@ exclude google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9 // https://github.com/open-telemetry/opentelemetry-collector/pull/7644 // https://github.com/open-telemetry/opentelemetry-collector/pull/7696 // https://github.com/open-telemetry/opentelemetry-collector/issues/4970 -replace go.opentelemetry.io/collector => github.com/grafana/opentelemetry-collector v0.4.1-0.20230925123210-ef4435f79a8a +replace ( + go.opentelemetry.io/collector/otelcol => github.com/grafana/opentelemetry-collector/otelcol v0.0.0-20231018134914-c0109e052230 + go.opentelemetry.io/collector/service => github.com/grafana/opentelemetry-collector/service v0.0.0-20231018134914-c0109e052230 +) // Required to avoid an ambiguous import with github.com/tencentcloud/tencentcloud-sdk-go exclude github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194 diff --git a/go.sum b/go.sum index 891464d251c5..6d26249e820c 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aD cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= -cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= +cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -184,8 +184,8 @@ github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaa github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/IBM/sarama v1.41.1 h1:B4/TdHce/8Ipza+qrLIeNJ9D1AOxZVp/3uDv6H/dp2M= -github.com/IBM/sarama v1.41.1/go.mod h1:JFCPURVskaipJdKRFkiE/OZqQHw7jqliaJmRwXCmSSw= +github.com/IBM/sarama v1.41.2 h1:ZDBZfGPHAD4uuAtSv4U22fRZBgst0eEwGFzLj0fb85c= +github.com/IBM/sarama v1.41.2/go.mod h1:xdpu7sd6OE1uxNdjYTSKUfY8FaKkJES9/+EyjSgiGQk= github.com/Jeffail/gabs v1.1.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= @@ -210,8 +210,8 @@ github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpz github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/Microsoft/hcsshim v0.10.0-rc.8 h1:YSZVvlIIDD1UxQpJp0h+dnpLUw+TrY0cx8obKsp3bek= -github.com/Microsoft/hcsshim v0.10.0-rc.8/go.mod h1:OEthFdQv/AD2RAdzR6Mm1N1KPCztGKDurW1Z8b8VGMM= +github.com/Microsoft/hcsshim v0.11.0 h1:7EFNIY4igHEXUdj1zXgAyU3fLc7QfOKHbkldRVTBdiM= +github.com/Microsoft/hcsshim v0.11.0/go.mod h1:OEthFdQv/AD2RAdzR6Mm1N1KPCztGKDurW1Z8b8VGMM= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.0.1/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= @@ -252,12 +252,12 @@ github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ github.com/aerospike/aerospike-client-go v1.27.0/go.mod h1:zj8LBEnWBDOVEIJt8LvaRvDG5ARAoa5dBeHaB472NRc= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk= -github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= +github.com/alecthomas/assert/v2 v2.3.0 h1:mAsH2wmvjsuvyBvAmCtm7zFsBlb8mIHx5ySLVdDZXL0= +github.com/alecthomas/assert/v2 v2.3.0/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU= github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= -github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g= -github.com/alecthomas/participle/v2 v2.0.0/go.mod h1:rAKZdJldHu8084ojcWevWAL8KmEU+AT+Olodb+WoN2Y= +github.com/alecthomas/participle/v2 v2.1.0 h1:z7dElHRrOEEq45F2TG5cbQihMtNTv8vwldytDj7Wrz4= +github.com/alecthomas/participle/v2 v2.1.0/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk= github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -279,8 +279,8 @@ github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHG github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antonmedv/expr v1.15.0 h1:sBHNMx1i+b1lZfkBFGhicvSLW6RLnca3R0B7jWrk8iM= -github.com/antonmedv/expr v1.15.0/go.mod h1:0E/6TxnOlRNp81GMzX9QfDPAmHo2Phg00y4JUv1ihsE= +github.com/antonmedv/expr v1.15.3 h1:q3hOJZNvLvhqE8OHBs1cFRdbXFNKuA+bHmRaI+AmRmI= +github.com/antonmedv/expr v1.15.3/go.mod h1:0E/6TxnOlRNp81GMzX9QfDPAmHo2Phg00y4JUv1ihsE= github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/DiJbg= github.com/apache/arrow/go/v12 v12.0.1/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWMLpY67QwZ/WWw= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= @@ -316,40 +316,40 @@ github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZve github.com/aws/aws-sdk-go v1.34.34/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.68/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.45.2 h1:hTong9YUklQKqzrGk3WnKABReb5R8GjbG4Y6dEQfjnk= -github.com/aws/aws-sdk-go v1.45.2/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.45.24 h1:TZx/CizkmCQn8Rtsb11iLYutEQVGK5PK9wAhwouELBo= +github.com/aws/aws-sdk-go v1.45.24/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.7.0/go.mod h1:tb9wi5s61kTDA5qCkcDbt3KRVV74GGslQkl/DRdX/P4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.18.1/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= -github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= +github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= +github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/config v1.18.27/go.mod h1:0My+YgmkGxeqjXZb5BYme5pc4drjTnM+x1GJ3zv42Nw= -github.com/aws/aws-sdk-go-v2/config v1.18.38 h1:CByQCELMgm2tM1lAehx3XNg0R/pfeXsYzqn0Aq2chJQ= -github.com/aws/aws-sdk-go-v2/config v1.18.38/go.mod h1:vNm9Hf5VgG2fSUWhT3zFrqN/RosGcabFMYgiSoxKFU8= +github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= +github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= github.com/aws/aws-sdk-go-v2/credentials v1.13.26/go.mod h1:GoXt2YC8jHUBbA4jr+W3JiemnIbkXOfxSXcisUsZ3os= -github.com/aws/aws-sdk-go-v2/credentials v1.13.36 h1:ps0cPswZjpsOk6sLwG6fdXTzrYjCplgPEyG3OUbbdqE= -github.com/aws/aws-sdk-go-v2/credentials v1.13.36/go.mod h1:sY2phUzxbygoyDtTXhqi7GjGjCQ1S5a5Rj8u3ksBxCg= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4/go.mod h1:E1hLXN/BL2e6YizK1zFlYd8vsfi2GTjbjBazinMmeaM= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.69 h1:u9tquzvPabbR1hghIq0+snSCYPeF9jA7JeB46iazH6w= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.69/go.mod h1:KzrYE4t9hLh8TjJkfGsmPYcVlYb7QWiPPv3aCOhwms0= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34/go.mod h1:wZpTEecJe0Btj3IYnDx/VlUzor9wm3fJHyvLpQF0VwY= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28/go.mod h1:7VRpKQQedkfIEXb4k52I7swUnZP0wohVajJMRn3vsUw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35/go.mod h1:0Eg1YjxE0Bhn56lx+SHJwCzhW+2JGtizsrx+lCqrfm0= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 h1:GPUcE/Yq7Ur8YSUk6lVkoIMWnJNO0HT18GUzCWCgCI0= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26 h1:wscW+pnn3J1OYnanMnza5ZVYXLX4cKk5rAvUAl4Qu+c= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26/go.mod h1:MtYiox5gvyB+OyP0Mr0Sm/yzbEAIPL9eijj/ouHAPw0= github.com/aws/aws-sdk-go-v2/service/amp v1.16.14 h1:cak6jLkSwmPqcJ7pcVlkABsYfjCxxiyjBM2xBgjPwmY= @@ -372,8 +372,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29 h1:zZSLP3v3riMOP1 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29/go.mod h1:z7EjRjVwZ6pWcWdI2H64dKttvzaP99jRIj5hphW0M5U= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.28/go.mod h1:jj7znCIg05jXlaGBlFMGP8+7UN3VtCkRBG2spnmRQkU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3 h1:dBL3StFxHtpBzJJ/mNEsjXVgfO+7jR0dAIEwLqMapEA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3/go.mod h1:f1QyiAsvIv4B49DmCqrhlXqyaR+0IxMmyX+1P+AnzOM= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.14.15 h1:5I9Yi2Ls1q8/VTpRmlLOGilFCtJNsEms+64BhYybm7Y= @@ -384,22 +384,22 @@ github.com/aws/aws-sdk-go-v2/service/shield v1.18.13 h1:/QqZKWvxShuecy5hZm6P4pJQ github.com/aws/aws-sdk-go-v2/service/shield v1.18.13/go.mod h1:YcHL79qHynGYok2NKGb3+mrb6EWROWD4gBU3v+tKtUM= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sso v1.12.12/go.mod h1:HuCOxYsF21eKrerARYO6HapNeh9GBNq7fius2AcwodY= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.6 h1:2PylFCfKCEDv6PeSN09pC/VUiRd10wi1VfHG5FrW0/g= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.6/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12/go.mod h1:E4VrHCPzmVB/KFXtqBGKb3c8zpbNBgKe3fisDNLAW5w= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.18.16 h1:Gk+75k6j55fqE+uA/99jAlcZBY4OLT244JuKp+HLXxo= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.18.16/go.mod h1:l/XhpyuxnJ3s8yKi9h0XDwVqM18iDEFeUVDYGCEcE/g= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= github.com/aws/aws-sdk-go-v2/service/sts v1.19.2/go.mod h1:dp0yLPsLBOi++WTxzCjA/oZqi6NPIhoR+uF7GeMU9eg= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/smithy-go v1.5.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= -github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= +github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0 h1:0NmehRCgyk5rljDQLKUO+cRJCnduDyn11+zGZIc9Z48= github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0/go.mod h1:6L7zgvqo0idzI7IO8de6ZC051AfXb5ipkIJ7bIA2tGA= github.com/beevik/ntp v1.3.0 h1:/w5VhpW5BGKS37vFm1p9oVk/t4HnnkKZAZIubHM6F7Q= @@ -495,12 +495,12 @@ github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8a github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZZJDa8o= -github.com/containerd/containerd v1.7.3/go.mod h1:32FOM4/O0RkNg7AjQj3hDzN9cUGtu+HMvaKUNiqCZB8= +github.com/containerd/containerd v1.7.6 h1:oNAVsnhPoy4BTPQivLgTzI9Oleml9l/+eYIDYXRCYo8= +github.com/containerd/containerd v1.7.6/go.mod h1:SY6lrkkuJT40BVNO37tlYTSnKJnP5AXBc0fhx0q+TJ4= github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.4.1 h1:wQnVrjIyQ8vhU2sgOiL5T07jo+ouqc2bnKsv5/EqGhU= -github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= +github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtOs= github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= @@ -582,8 +582,8 @@ github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m3 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= -github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.6+incompatible h1:hceabKCtUgDqPu+qm0NgsaXf28Ljf4/pWFL7xjWWDgE= +github.com/docker/docker v24.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= @@ -1004,8 +1004,8 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= -github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= +github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ= +github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -1062,8 +1062,10 @@ github.com/grafana/mysqld_exporter v0.12.2-0.20231005125903-364b9c41e595 h1:I9sR github.com/grafana/mysqld_exporter v0.12.2-0.20231005125903-364b9c41e595/go.mod h1:U8ifHC5pT2WuVTO7ki4KZmWLjfEKfktQiU3bh0J8scw= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20231004161416-702318429731 h1:vyyIYY2sLpmgFIckJ1vSO/oYkvB0thDF6UiFYp5PThM= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20231004161416-702318429731/go.mod h1:vOZxEzxm0nZmuNqjtIfvtmvdRtJik9POmcN5mQVLf5E= -github.com/grafana/opentelemetry-collector v0.4.1-0.20230925123210-ef4435f79a8a h1:co7JnXySBilXDBu0hhw3furJZLJg9SFojos1PMO+lW4= -github.com/grafana/opentelemetry-collector v0.4.1-0.20230925123210-ef4435f79a8a/go.mod h1:jcETa0UJmwkDSyhkOTwQi8rgie1M3TjsIO98KeGM2vk= +github.com/grafana/opentelemetry-collector/otelcol v0.0.0-20231018134914-c0109e052230 h1:TT+IIRYVmpUGfZhzEgpqf0mQFhTKaeMbV+0RKleguf4= +github.com/grafana/opentelemetry-collector/otelcol v0.0.0-20231018134914-c0109e052230/go.mod h1:BSCvlVMyWLH3704kfGUv8KWRRN2nvNJBOBcfKttXTDM= +github.com/grafana/opentelemetry-collector/service v0.0.0-20231018134914-c0109e052230 h1:f054R0C2NPdYXRl6kV+tGSI69Y4Vl/vduo2m/iIuSFE= +github.com/grafana/opentelemetry-collector/service v0.0.0-20231018134914-c0109e052230/go.mod h1:kBdpzrqR2wJkOdg50yzp4dv+2XBMyeqTgF4lCx0hSpQ= github.com/grafana/perflib_exporter v0.1.1-0.20230511173423-6166026bd090 h1:Ko80Xcl7xo1eYqkqLUb9AVVCLGVmuQp2jOV69hEEeZw= github.com/grafana/perflib_exporter v0.1.1-0.20230511173423-6166026bd090/go.mod h1:MinSWm88jguXFFrGsP56PtleUb4Qtm4tNRH/wXNXRTI= github.com/grafana/postgres_exporter v0.8.1-0.20210722175051-db35d7c2f520 h1:HnFWqxhoSF3WC7sKAdMZ+SRXvHLVZlZ3sbQjuUlTqkw= @@ -1101,8 +1103,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vb github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 h1:LSsiG61v9IzzxMkqEr6nrix4miJI62xlRjwT7BYD2SM= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1/go.mod h1:Hbb13e3/WtqQ8U5hLGkek9gJvBLasHuPFI0UEGfnQ10= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= @@ -1116,8 +1118,8 @@ github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoP github.com/hashicorp/consul/api v1.8.1/go.mod h1:sDjTOq0yUyv5G4h+BqSea7Fn6BU+XbolEz1952UB+mk= github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= -github.com/hashicorp/consul/api v1.24.0 h1:u2XyStA2j0jnCiVUU7Qyrt8idjRn4ORhK6DlvZ3bWhA= -github.com/hashicorp/consul/api v1.24.0/go.mod h1:NZJGRFYruc/80wYowkPFCp1LbGmJC9L8izrwfyVx/Wg= +github.com/hashicorp/consul/api v1.25.1 h1:CqrdhYzc8XZuPnhIYZWH45toM0LB9ZeYr/gvpLVI3PE= +github.com/hashicorp/consul/api v1.25.1/go.mod h1:iiLVwR/htV7mas/sy0O+XSuEnrdBUUydemjxcUrAt4g= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM= @@ -1454,8 +1456,8 @@ github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs= @@ -1659,8 +1661,8 @@ github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mostynb/go-grpc-compression v1.2.0 h1:KJzRFSYPXlcoYjG5/xLZB8tpuOyWF2UnlW4tAuaWnfI= -github.com/mostynb/go-grpc-compression v1.2.0/go.mod h1:oidYvYyefMmhcuvU8fLJ8FfZyTyVzJ6SkmD5fIKgRe8= +github.com/mostynb/go-grpc-compression v1.2.1 h1:16tdYxBZSD8p9AUmvw4F7Nyc2T4/eE7XsIXrgxSEcJI= +github.com/mostynb/go-grpc-compression v1.2.1/go.mod h1:oidYvYyefMmhcuvU8fLJ8FfZyTyVzJ6SkmD5fIKgRe8= github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= @@ -1736,86 +1738,88 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.85.0 h1:GlfxCiBxlHlfgFABQI/K2oVvjZEnSF7ZIk/tTl6pnE0= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.85.0/go.mod h1:CA1v4fzjPVIu/YEDD9Q6FppAGhZGBBxQ+MKAvMERd0o= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.85.0 h1:r75lKRDTUz+qCMO5Bghe1o6Snef7Vov55ycQChB/vps= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.85.0/go.mod h1:enlrQwrV86jYc8w5rCrvJkXBjZqPUyexs53pFY7YjXo= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.85.0 h1:zCFV4nSdHziunsWYB/Zwsy2C4W88KlACyENQyjLZHw8= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.85.0/go.mod h1:ADyJg6g2zJ3t6FMGOdw0PjmFhZhDxNT2QVFdt6ZFl5k= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.85.0 h1:qBUujYIkqkctwNkmnAF8ajbVN357DQNbOPp6VAe4ldE= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.85.0/go.mod h1:Uh+cZTlVkTSNqdGH6VFvzI2P9IMrLecQlIZQBOfQOnc= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.85.0 h1:2nEjzC4LZ0Y0NptV1XyOCkqZ3/ogQ/vQzLUa5QWKijI= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.85.0/go.mod h1:RpGBotLXh2ilbGkWDmd4bp4uPYvG4VcVqEVpIVTynX4= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.85.0 h1:cnIl/ZbHWgvKiyQwYb2r/vRjtcOt8P9vtzwMy0qexkA= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.85.0/go.mod h1:DxEsaZJKZkTODUe9Xk4szb2uN68oO5lCGTJs8XEgnq0= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.85.0 h1:hQeqYG2Mm65N1/WgN29Llp9DUrh/dn5u/P2gstq1wCI= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.85.0/go.mod h1:pDzmsvv8WDeFK3ic+2fHARyijjSRt0R/IEWJkeGZF/E= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.85.0 h1:GyLgpYPWl0H8zWC3pOn3/iK0UCBdm+pkyh/8jrLu1gM= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.85.0/go.mod h1:Bl1zkA4WTBKOTI6pAmu2bmZz7A/uzktl8mEGEJeMuRk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.85.0 h1:7NhUSWfBD2XO2cbZwzwJKxgDudBAnNVokHuCAhSk/Yk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.85.0/go.mod h1:d1OoHdbhSoeX+Fw7uhCbh3MsL5QloaZUpvHr2nYPPYo= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.85.0 h1:1nYEFhNxBCQrmuLDMZ1k9l+x9Yu/34wvlCQC4HQ/NBQ= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.85.0/go.mod h1:vWpzX944vP6kAIvLh+o/2c82r6TJFP86+1sWEa6xy8I= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.85.0 h1:iqnSaTcx4PVQMAAip/qc6a6wDnahLESqxPLyA99lnSs= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.85.0/go.mod h1:SOWmY8/uVRokEa5jRo5iKt8bNAfv+3juQhvWVgNijdg= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.85.0 h1:LSh3CEsFBQJykzrnAzFP2RhdWTR8tpPiQYa3Cjl5+oI= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.85.0/go.mod h1:6XJ+dV/QjwFJf55/2nnVfVqA+qwa8Y/iYR6taPJN7n0= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.85.0 h1:syi7DOno9/zo5t90bdqQe9EhFMjeozS2RT1A2Ty/bVM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.85.0/go.mod h1:EYEP2YlL07/NxO3pcvWnIuhzvKkqf/wWwpy18AgwswA= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.85.0 h1:rDVucR5Q/g6HQlMyWEWju/rOyUN7qacpROZ0N97yDP4= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.85.0/go.mod h1:xqsEf4HxnK4Vv1InYcaC2+M2Ai1Lv692w4/FzFFUsf0= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.85.0 h1:nd2eIW1N48oIvqpET/DgBmZvihxZ9UeSoQ/lw97lLRM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.85.0/go.mod h1:9KGdGE/iboSF6Im8pJjlSYno1eWstqmyHjvLlHNjsfA= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.85.0 h1:jRmez+0SQh2qXEPoCV1Q3fmWp74JCvBCG97RM/plgeQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.85.0/go.mod h1:EJM9+YNuscSrUJRy1Ova2BVN+uVCaf/fulux+/N1x7s= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.85.0 h1:plmdyj3LIr5OpCbVVbAQqMxWfJTKIpSchdJe6UNCfc8= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.85.0/go.mod h1:xrmwe0y/uT3xO71CXiGwrlPlLKhYhgVgBz3xYic0QlU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.85.0 h1:XfnAuVvOwVfHBwvFQ6KnDu5BX5FigUMD/xZSOGEGVkM= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.85.0/go.mod h1:ZID3Mi1KQdFFXjqDTZhMHKyGP5XLpCFpxKFOFkKdrZE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.85.0 h1:XsXt3M2JuoDCNNlQ82ADkUh2oCCAJWE9FEtQrD4gTzw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.85.0/go.mod h1:vXO40EfN5f7rYKj1bpxxD2nNi+NQXl4pJyDiVPrF+No= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0 h1:M8jCisGDhD0WbSwaA54pIX7WTn9/x/wAcUEXtTRExbw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0/go.mod h1:DvfKdx5R9XmbgOUi2WyyT3pqLVvIShOlPwve75UoIu8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 h1:spVx9VQV8KV6EsvyeBjoz7lfZxApg0InR8Ju6j3Yyk0= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0/go.mod h1:h5h6CZwte3hBoitlWffAO2OHtc38jBRdr1UAS9hyXFs= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.85.0 h1:HxYC9D6ghO9qjUbuNscASG6D2ONTmf3izq3Pb8Kb7/s= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.85.0/go.mod h1:kbCp9bF+bKcP4d06k6ZLOHFt8RAIDDan+eCFErGOTvY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.85.0 h1:QKGCvj0d39TS9UqgATvxZw7Uv1T7K3ltQDZCqvuIA70= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.85.0/go.mod h1:KY3tDk0Qw1ljMm0ZURFirGzK0CDQ2FdcO2bAUbO4Ces= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.85.0 h1:daoMo9KqiOdzDwqN8vyHf24O5qHShKYO7PNGKC5KboU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.85.0/go.mod h1:fBPgo1GzlhmkrYh1sQv/uGVPb3dXc5uvsyRXbC9khto= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.85.0 h1:2WfpR3KtqoieLKvX8i/qgVUaAsFPQvC9bAezwXkqJeg= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.85.0/go.mod h1:pr/v+adDLLf3YOnNYM6lAyDjMen0g4TIx5aPEmNX8wE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.85.0 h1:xM+OELzJqaDJrYt+GoDdVgjruJVPL4jtaaUxM3CNvM8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.85.0/go.mod h1:AjlewnpSdqaRwimNsRURcRqP6hLpUnTUt6GUTIMmYdg= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.85.0 h1:enXJ+7+GKrN75rXXbzk7y+Dj71Q3yCCnuM4zS2s/sM8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.85.0/go.mod h1:FHdoZFzoeJpY/6IoWJdYyNIujAT5HQt9vDesTLoRi/s= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.85.0 h1:PnJ0/r2of30G2p4zvRX9clLBTg6XxMX+J/OlGwzOf9s= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.85.0/go.mod h1:HKFzmbw5Zru0tKiSrmCBpqFL7GTp4+cLx080jCCTyH4= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.85.0 h1:vK37a10AM3J71Bk9XneegSArIHn8mGg0fAWKMLF04So= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.85.0/go.mod h1:1BGMjfk6Ez1QN/mB7msUSLtHVOxh8cdbzYvfkwAqhBU= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.85.0 h1:CSTjgZAvRzrQsXdF+/zjn3zZqVFIJItHCCVYZbeVjkw= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.85.0/go.mod h1:bYyB9WkB7vLljsM9RoxZcp0cvqzS+UHtVM0FlrDrMMk= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.85.0 h1:gwb/rPTM1P9p6Lpwu3OdySVUcAuG6LFrbrvkpELYn40= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.85.0/go.mod h1:9/udK3xXn4MJVPr5ITJVVPOyXVabEZ4MmX1Zs9F4fTI= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.85.0 h1:EMg8KxoXASdKr2eBxF8oGk3+mHTyeff78X2QeyhKBqg= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.85.0/go.mod h1:6jwOROZzbngLthe/gtVMfhW6df1vMIRl0zaS3J2jD7M= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.85.0 h1:T52tY6MESA+AyJSWUVHhqryGq/oJ3jcgsvCdR9HKNsQ= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.85.0/go.mod h1:Rp+79qY7tJEgja2kHdWkWS0WDHP4+KRPfHmttCjbwDo= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.85.0 h1:R4oQpH2bRx6UEGDdv15S2GkkkDFRbjXLO1b8fcjS8Lg= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.85.0/go.mod h1:WuIjXo1AF9FWkG5HVSnm5koj27SEoVmENH3YVDNR1x4= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.85.0 h1:8bhHzQpYe0zFANlQU+yRvhqsVFMRpaqtBVlHzyPqHkc= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.85.0/go.mod h1:D1VNHbfUdVgtWiXUwr6OBetOl+TVDsZ8PkC5Fji1AAc= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.85.0 h1:1oQGK9OibOxvtJcnCdB6+r6jGpzSp3DrcoeaVgCwP28= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.85.0/go.mod h1:GNnx5ftrhf2bBSVIUzvfAkXBBjHfUYvmUOuR7mJWUOE= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.85.0 h1:yDfzy7NPgjWptm/wmbLunsbV4L6YzY1fwXY5i++afFU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.85.0/go.mod h1:4CAO66nuOh7+PD+mFCDGwaE886OGLeHDIj6tv4SywX8= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.85.0 h1:FO1PlMgwFR9GAsCLjJfwZBKoJenuoOoroZf/GGDtQZ8= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.85.0/go.mod h1:wsdAnq5HElTTsnKpRLvNHYpRBtPw1Cp37JmwPEzKwDw= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.85.0 h1:8jlK2ASLOVtSkepS2go85uO6lpkijNB57JRFRE/Krd4= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.85.0/go.mod h1:K9xVwBx7BnCJAE0xY7iUvpUKCfQ1d2p4VD/m1ejeKV0= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.85.0 h1:6HRuMEGl9DM95tWIUbFnweTYExCstQxfilEzUf2LP4E= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.85.0/go.mod h1:wjpPPGJxPkPRMf4tAwiUec/NecTBL7376pA++PwqRBs= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.87.0 h1:ArBXfq0KQ89DV9th/MU/snH205Uh6jFCnIiwd/wKp+s= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.87.0/go.mod h1:hN1ufLEIhE10FeG7L/yKMXMr9B0hcyrvqiZ3vR/qq/c= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.87.0 h1:RUlUN9Rtd8pVq3tI6pbmpiCTGiAzDCJcwT4EMGnOeBg= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.87.0/go.mod h1:vKVg+UCn1agpq5A3EaFol1bbkxAlm3CCQQHlTb9+sZo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.87.0 h1:JADmKOCiLljFDjic3Fb5yyPsvNj7IBJyZU6QrnOUZH0= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.87.0/go.mod h1:WKjmyVi+Xhhvuvj2J+1Z0fXvY38MKRbREe2aR5UPOIw= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.87.0 h1:+apdZt5DPPIxjBrayu1muKbvUK3zqsfgb+3fMh6Hnyo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.87.0/go.mod h1:JXVmcuySy3xyo3JjoU+CrNWy/C12Fw6JB1HWXf26HwQ= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.87.0 h1:5LmBAlLycadwA3AHI2rqPuDjx1HFb/PSn3946Eyp3Jw= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.87.0/go.mod h1:lgOFfu/GLf6LbvZwlumkUv3iBLqRdtBentZKcrrqb3Y= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.87.0 h1:p4pPpRv9zOT/kOQT8GJPhl2drySkTDIpLEhLjXjo5yc= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.87.0/go.mod h1:vbU0PUtyhWa3iwIJn7blygKYVnt2GzEAA66zlPbLz90= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.87.0 h1:UVFqhd0y7IGSabrHUiDX4efC7qW71tq/FyDFPcBFaJE= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.87.0/go.mod h1:xPWViWgSZhXRGGeByF+awZSb0CwnTHyt9RGXYZ7AwPg= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.87.0 h1:YMVikePSZOjuB6mdXUQdxiSssexzj+8yD2DzZHEiy4g= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.87.0/go.mod h1:HVqsfJuqdPN6vz+x/uHr6sg9MPj0DeWng6Ja4mfdNpk= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.87.0 h1:le3sa1Vkn2IxRqahljtWf47rTPkaA05BxPGGoYY96Zw= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.87.0/go.mod h1:Ik+BslrriohE2WlcxZDvJ9KkYji/L4FaXDwaLm2ADAk= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.87.0 h1:HeNHs47RQP8nrcujyJY8DI14H1GwN3luXg871LaFfCA= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.87.0/go.mod h1:DRpgdIDMa+CFE96SoEPwigGBuZbwSNWotTgkJlrZMVc= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.87.0 h1:Z4o71/rS7mmpJ/9uzta3/nTaT+vKt0CU35o4inDLA9Y= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.87.0/go.mod h1:clScLUe8m0CTZMcV0scqq+fFFvw5Q1dASkYlYsrRptM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.87.0 h1:W4Ty2pSyge/qNAOILO6HqyKrAcgALs0bn5CmpGZJXVo= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.87.0/go.mod h1:3EFmVoLcdM8Adj75N8TGJ4txDB29oW1chTLCFiL/wxs= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.87.0 h1:ekT4/I9J484j4yR/0VHj5AGtgv8KmNd+e4oXxNJNR/o= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.87.0/go.mod h1:waI3VDdKYW7es1LmLY35SHJYNwUX+JJN719wXmP3WAc= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.87.0 h1:jtCKA0Mfc5RgZzPGuxXioW8oCSmJsayqXSCTlaA67xM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.87.0/go.mod h1:vt3N5XEF1QigYUz4NagTDL3/Gd8bivCLcYFoi91Luy8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.87.0 h1:+T/u+x1tO7FShn0DBLB9mqAE2MnXoAZ+u70q5wSbt9E= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.87.0/go.mod h1:/K1o7YNhLJ0WIoI0+pQFbhf/lqCX4FJC33J7uY0ey/U= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.87.0 h1:om2WAvLFABdCdJWjE6GdK9xEn8me0z9UN3gz091SiG4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.87.0/go.mod h1:ntSfqIeoGj0O+pXXyqDG9iTAw/PQg2JsO26EJ1GAKto= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.87.0 h1:kDamu7uZHRmeJWqaJg42LSgprRGokmQ4t8ACslzS0GU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.87.0/go.mod h1:EAw9aBkrDIDWQvRBdJiDkaJmCqcgZpiZzYZEvOjg4uI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.87.0 h1:sx1ye7Y2rJ2qi11i2ih9T7BocxaV0uaBBf7B8ijCYpU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.87.0/go.mod h1:AobBiNPFNHUm0MJFTieajasG/xNMjMYI7BGGTSKh0xg= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.87.0 h1:sy75u6ZwBvRwv9RjEF65SqlkBsAeZFqF4+eFOLhIsJQ= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.87.0/go.mod h1:trWrnucNKCkBEYpe5IBo+RgGQtzwMT454sGkWsggmDM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.87.0 h1:jtdLqdRyt29EUd6H6p431/XmGHwS6BHB5s/EqCfEWoc= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.87.0/go.mod h1:JUVS9CCWJyXSJn8cTmS2Dq3vC3jlhJozjg3SZdZ/4OY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0 h1:9RtkoPmUPRW1NrOawEiWsxOZ/dBlym5DzhLXjRpM9tM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0/go.mod h1:xvO0/6zTw6UBl7g4hZpvapfvANNSnj6sQcSnF6jqSSg= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0 h1:zA50pvJziZjWQiN9MZIkT6Ii3hMSaCKa6jvs1vCYT5g= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0/go.mod h1:IjdtiiTTNlAkspcNyAjHysWAZs5U48alWGUodTkkxhI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.87.0 h1:JFPnEdsGaGhay69k7QJJuT7gq3XQn8fzYL1gm4Oqpj0= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.87.0/go.mod h1:EWuhJl1M5r6lsFeQntHKxkjKzsmM2T4vLk8zWS5TL2A= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.87.0 h1:WRgrvgi/fHuOrqlXgILssE+Bujdd3rCoB3FWfd37g/s= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.87.0/go.mod h1:OvjvWY8zLsGEiYQRQIyLE4FhmOhJmveebbwVhBVxB54= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.87.0 h1:H0nkDuusL0FAMGy3ANaVjmpDfdQjmz2nJa4SzJ5s6Jw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.87.0/go.mod h1:U7TXNkK7vwi687WZYi7iZFmM1/0G06qsTIHqkTmsyjA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.87.0 h1:25XSKNdhAuuLvJdPJ0Je4vRGJmG/8iXOspzeMIr4zSE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.87.0/go.mod h1:hKArXrn+iYk888KKQThhdPEgPf2GMay2CBe7NnTnmTs= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.87.0 h1:1eceF0bEseOnk7K6U5OdrEcFKvxEdjnqHTzwNAw2pxA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.87.0/go.mod h1:shG9MpBWsBTzns2MYKRFiRymJXhdNb3snGyjgTW5mDg= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.87.0 h1:RljU9Xodt7Ptc0enTRuTwUotGi2BuiWBqCUVQwT1otY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.87.0/go.mod h1:ybZnD0ldx1tEm6xgJ5wP5tK2x6AY8PNpTonCpOBVI6Y= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.87.0 h1:9MVdMcdtc+Gl0DAaeZ+PdJzskIg1K8FKuYql4h6pQC0= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.87.0/go.mod h1:NLScciQgJO4tKQ7vXqiUkzjk6O3bo2aMVkMcmYsSDQY= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.87.0 h1:mm9DXnoWNHckL0MnYdmCNOU5DOomwdGeUl9t51bQ/Ac= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.87.0/go.mod h1:g6H0fB9TW03Lb8M+H0BXtgQp7gPncIwf3Fk73xOs9EA= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.87.0 h1:QJKdtNcsxBhG2ZwSzYRVI0oxUqBJJvhfWf0OnjHU3jY= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.87.0/go.mod h1:skMmFcl+gxyiOQXvwHc0IKpC73iyQ7zl9r1aRNmPMwI= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.87.0 h1:BIGb6dfmaTlDE7KbiQUhnD9SvL5HanbJbWJrnzURfPY= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.87.0/go.mod h1:EnaQxXfCCWkSEfsQbGOvYbeJ/EuqvtMYTLTq8RN6TiY= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.87.0 h1:4l/QetnprIMethZYfD2RK+MfMR83f6QycYb9bhJFItc= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.87.0/go.mod h1:MQlwEsqYNvM8oTaI6pHOG/NBv2wrpE3daRi8hr9caao= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.87.0 h1:ElQCXm3L6LxiqT4k/jHKCVA1GnbbMYVgd8+pYDubH8o= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.87.0/go.mod h1:e8r2y116jZ32ugu/x5pzIxb0UVGVFfSezt8v7ilXgCE= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.87.0 h1:+eb5MvKfh3gPss00kvgPTS7SDLJND6zJEcZoQlxOiIE= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.87.0/go.mod h1:iUrecf5kSV8pGF7OaM/brFOJs4OMEhogclBncGT5QtI= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.87.0 h1:1TK0+QULqgwwvE8JJxpQlugRdUw6knt0vYMkI65Jac0= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.87.0/go.mod h1:UYmAgkCKmtMyt40ffRherZJcU3zeCJjq4nZ7hVxApT4= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.87.0 h1:8LN1Ky+Q6L6dmzm3k7Bec4fmlYs1OuJ7vaMuVnVIBLo= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.87.0/go.mod h1:xb97OESLQFviQ0ikbUmneISHuRG91Uf+97EymDW4yus= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.87.0 h1:+rsOWSP9SDxbnwmRmQcsdZZJJeHvuKjPFN10jQXgsQI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.87.0/go.mod h1:2ALknylZKXTYYM7TnHAJKBxy3Z85IhowQiWCcEdfk5Y= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.87.0 h1:AgW1CDlKYfm5jwk/k6uibKqhxshUOMXm6P5ze2AJmMc= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.87.0/go.mod h1:LIGa2oqb+geqkmWvteeDjzulK1PfDYCY8Jp6pI0ey2A= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.87.0 h1:fwmow4M0aJUsmY9DGUMe6yykd0TvgB6PpLS+Z590R5s= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.87.0/go.mod h1:ZLfpGguza42G+SwGEZ5/plr1wa3D7GA7I6KJyARgHPA= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.87.0 h1:0DeNqM3fhNYPsfmPbaZ1PyBJ2vtOSFpMGadRKvryXfs= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.87.0/go.mod h1:tSxkxxWCcGh/vh1mHflhQTlwulkwWM1yyEABa6DXSmY= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -1959,8 +1963,8 @@ github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1: github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM= -github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.0.0-20180326160409-38c53a9f4bfc/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -2034,8 +2038,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= -github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8= -github.com/rs/cors v1.10.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= @@ -2072,8 +2076,8 @@ github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil/v3 v3.23.8 h1:xnATPiybo6GgdRoC4YoGnxXZFRc3dqQTGi73oLvvBrE= -github.com/shirou/gopsutil/v3 v3.23.8/go.mod h1:7hmCaBn+2ZwaZOr6jmPBZDfawwMGuo1id3C6aM8EDqQ= +github.com/shirou/gopsutil/v3 v3.23.9 h1:ZI5bWVeu2ep4/DIxB4U9okeYJ7zp/QLTO4auRb/ty/E= +github.com/shirou/gopsutil/v3 v3.23.9/go.mod h1:x/NWSb71eMcjFIO0vhyGW5nZ7oSIgVjrCnADckb85GA= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= @@ -2185,8 +2189,8 @@ github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955u github.com/tencentcloud/tencentcloud-sdk-go v1.0.162 h1:8fDzz4GuVg4skjY2B0nMN7h6uN61EDVkuLyI2+qGHhI= github.com/tencentcloud/tencentcloud-sdk-go v1.0.162/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI= github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod h1:RHkNRtSLfOK7qBTHaeSX1D6BNpI3qw7NTxsmNr4RvN8= -github.com/testcontainers/testcontainers-go v0.23.0 h1:ERYTSikX01QczBLPZpqsETTBO7lInqEP349phDOVJVs= -github.com/testcontainers/testcontainers-go v0.23.0/go.mod h1:3gzuZfb7T9qfcH2pHpV4RLlWrPjeWNQah6XlYQ32c4I= +github.com/testcontainers/testcontainers-go v0.25.0 h1:erH6cQjsaJrH+rJDU9qIf89KFdhK0Bft0aEZHlYC3Vs= +github.com/testcontainers/testcontainers-go v0.25.0/go.mod h1:4sC9SiJyzD1XFi59q8umTQYWxnkweEc5OjVtTUlJzqQ= github.com/testcontainers/testcontainers-go/modules/k3s v0.0.0-20230615142642-c175df34bd1d h1:KyYCHo9iBoQYw5AzcozD/77uNbFlRjTmMTA7QjSxHOQ= github.com/testcontainers/testcontainers-go/modules/k3s v0.0.0-20230615142642-c175df34bd1d/go.mod h1:Pa91ahCbzRB6d9FBi6UAjurTEm7WmyBVeuklLkwAKKs= github.com/tg123/go-htpasswd v1.2.1 h1:i4wfsX1KvvkyoMiHZzjS0VzbAPWfxzI8INcZAKtutoU= @@ -2326,100 +2330,102 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector/component v0.85.0 h1:RdeUDdX3prvkf0PFFbhMjWLsYUJdxy/d0oovOuObRDs= -go.opentelemetry.io/collector/component v0.85.0/go.mod h1:C3CWpjYa+k7Vjkqes/8abJ/fkCn6FlR1sNkW4QPd+kI= -go.opentelemetry.io/collector/config/configauth v0.85.0 h1:KJquqyQ/Am3wgyOEhLHAYmLix1Mow7zUORNKitUv6GQ= -go.opentelemetry.io/collector/config/configauth v0.85.0/go.mod h1:+NTOnvvrYtuLUu5e0dM9luKjeyzHf+DPK9MEP/S24Vk= -go.opentelemetry.io/collector/config/configcompression v0.85.0 h1:QWqDla4mE+pDV+97vnA8OpBxX4VJxllsi1DSMN2M0mo= -go.opentelemetry.io/collector/config/configcompression v0.85.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag= -go.opentelemetry.io/collector/config/configgrpc v0.85.0 h1:stXgQ5wzP7n30C9OGG7iqq30OOvo4+d+hIlVPSPLm1Q= -go.opentelemetry.io/collector/config/configgrpc v0.85.0/go.mod h1:eeLoy8XDh6Pb3y/6OkuxxTxk+ppf2MoJ2y+YM35avvo= -go.opentelemetry.io/collector/config/confighttp v0.85.0 h1:CwY8qLcMdRshKCPzdZX6UnH5QU4YwuXtLNt/E6if+LY= -go.opentelemetry.io/collector/config/confighttp v0.85.0/go.mod h1:T+UpZ+VwkayTaFOAANa4nkUx1P3YlYdR6gx6mSoEwsU= -go.opentelemetry.io/collector/config/confignet v0.85.0 h1:oo+P10MC5wWvSfN5NyZFqVXQCvVNfAwf0SIRDcFRuJ0= -go.opentelemetry.io/collector/config/confignet v0.85.0/go.mod h1:cpO8JYWGONaViOygKVw+Hd2UoBcn2cUiyi0WWeFTwJY= -go.opentelemetry.io/collector/config/configopaque v0.85.0 h1:FdQCf88Vq2yX7kiRswN00t/oGY+BbRCaAd0paG0if1A= -go.opentelemetry.io/collector/config/configopaque v0.85.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY= -go.opentelemetry.io/collector/config/configtelemetry v0.85.0 h1:hxKBwHEK4enl4YKtdZCq2rxxIKHrccoChoZlVgG8vbI= -go.opentelemetry.io/collector/config/configtelemetry v0.85.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= -go.opentelemetry.io/collector/config/configtls v0.85.0 h1:oYXJ5Je0218tXyJef1ri98HDEORPdToO4rM1C7D+1YI= -go.opentelemetry.io/collector/config/configtls v0.85.0/go.mod h1:IZJrxrpGoNb5W8U1ihe2lLOp0KdtBYPC6z2aoaBrRPo= -go.opentelemetry.io/collector/config/internal v0.85.0 h1:Pjr2XMqSLCHXsmzZrW7zVZf1VBcal84tYNDoEsu8loA= -go.opentelemetry.io/collector/config/internal v0.85.0/go.mod h1:XN8Y+Vhq/RqxGry7CGKwhMXJptUrmWTHdC6ZeI+Uy9E= -go.opentelemetry.io/collector/confmap v0.85.0 h1:xyshTMElkpCJRCbg9OyGL41f7ToCr+PRBJKuAbGR17I= -go.opentelemetry.io/collector/confmap v0.85.0/go.mod h1:/SNHqYkLagF0TjBjQyCy2Gt3ZF6hTK8VKbaan/ZHuJs= -go.opentelemetry.io/collector/connector v0.85.0 h1:eiDGlbhjRCrhZlgcIbm5fizKBnZ4t7P6bjgehldKx88= -go.opentelemetry.io/collector/connector v0.85.0/go.mod h1:2CK6s5lepQ59In8bBw6UmAknBCVxXQY9Xg6hCxJQjlQ= -go.opentelemetry.io/collector/consumer v0.85.0 h1:YG1yQHhuLWLNANyRIqM6QasVFKanDI/p51mcjXV8+k8= -go.opentelemetry.io/collector/consumer v0.85.0/go.mod h1:Ysc7XgJDZuNkyyvQVKz+/e6R3Z7haiOcFNsjkgmBSHY= -go.opentelemetry.io/collector/exporter v0.85.0 h1:06RnmrcEiBG3xhhGcGNT+hEk/j/4XtHavlMIxZcJHQE= -go.opentelemetry.io/collector/exporter v0.85.0/go.mod h1:4RNnq8xd6OBmc10XUF/K+NLUMfRiXrus+XRpAZeoLuA= -go.opentelemetry.io/collector/exporter/loggingexporter v0.85.0 h1:bSTfWv0RobFgs/c9g4jo5V8tFSlD2ILZZE2RrJ/eY44= -go.opentelemetry.io/collector/exporter/loggingexporter v0.85.0/go.mod h1:xQrg9pnp5XTvDZq/Q556emFZ90niT3jKhD4IQZQoWGw= -go.opentelemetry.io/collector/exporter/otlpexporter v0.85.0 h1:3MlKoGSFPdOHKtRcm5nTHRMpMmDtTGr6WAVrSuD0p3g= -go.opentelemetry.io/collector/exporter/otlpexporter v0.85.0/go.mod h1:wNkRTwQ4V3SZzvxzPpLME0EQkpySGTaiSHYcWhBuvkk= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.85.0 h1:mGHg023TB+PsGX1zLeXpQPhkEeEXsJrUBzf7uVurz4k= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.85.0/go.mod h1:2o3qKHeyxicOMkLO14yyI8hGHnNMZUul9VIlQKyd7zw= -go.opentelemetry.io/collector/extension v0.85.0 h1:izKozTZ4vOnYdMGhu0ROV69hXCptH6DI8JVkN/ZOEJQ= -go.opentelemetry.io/collector/extension v0.85.0/go.mod h1:l5zRPdhtmBjRmPeOhxJsZ/GRIimq4/HIAq/Rgf70W+o= -go.opentelemetry.io/collector/extension/auth v0.85.0 h1:mMZfNUCeWaXnQY85gepFA9uhzsEf0AAnAE4/Oblx/Wc= -go.opentelemetry.io/collector/extension/auth v0.85.0/go.mod h1:TBe1YtL27cc7liJFpamMhkmMVOEzR5/ccavvQFlLkAQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.85.0 h1:nhcOh4HAKOmOHEnZjCcicv3GXy9L7IKKXMkKMt54qm4= -go.opentelemetry.io/collector/extension/zpagesextension v0.85.0/go.mod h1:AtIm5TLpLr3mj6V1R6XnkSWHqxhEY1Oqsxl6qnWVQnE= -go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 h1:C9o0mbP0MyygqFnKueVQK/v9jef6zvuttmTGlKaqhgw= -go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/processor v0.85.0 h1:vN3A+E/rm6nCkx9iM+kjlMzXAtE0a2vP1JhF9oqLjZQ= -go.opentelemetry.io/collector/processor v0.85.0/go.mod h1:jp9vOjg9dS13zUy1ma6C4u4hGTdbp2GKb9xp5bX2krc= -go.opentelemetry.io/collector/processor/batchprocessor v0.85.0 h1:Rel52zGeC57hBVXV5av6FmGJiQCa2mYX84HHGaTPAH0= -go.opentelemetry.io/collector/processor/batchprocessor v0.85.0/go.mod h1:Qr/hC52XN0dNyRIZu1M4RxuKyYLsrzJoqYDvOEfH7TQ= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.85.0 h1:j2Q19NWQ0Aysj5NuSWznWfVf6YuOxj06pqhXRh09T7Q= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.85.0/go.mod h1:ZuRuTy9ItnOkPSVzRqAOL8BcF3PKRnPOVHPme2b8oN8= -go.opentelemetry.io/collector/receiver v0.85.0 h1:ecDJicAq1mbQcsEkzo1q+6Y2DP8plK51y4p4w7ZhNmA= -go.opentelemetry.io/collector/receiver v0.85.0/go.mod h1:6pmub7FpyQIAcCLmijUtelzWD9Jj8Csno7W+3FBQFJo= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.85.0 h1:RXL/SwHNyEumJrWdtFhygTxX9YUD4hUypUZz2E3K4fM= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.85.0/go.mod h1:/rGhYQiBUP3Lqw9EdUDYCUtUjgk3splKj51+bOKMSIM= -go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= -go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector v0.87.0 h1:160HewHp+/wzr62BzWjQgIvdTtzpaYTlCnGVb8DYnM0= +go.opentelemetry.io/collector v0.87.0/go.mod h1:VsAXXIK0D1na+Ysoy1/GIx0GgkH8vQqA6zwosddFz7A= +go.opentelemetry.io/collector/component v0.87.0 h1:Q+lwM5WAa2x4a5lgyaF6SjFBpIij5gyjsoiv9KFG36A= +go.opentelemetry.io/collector/component v0.87.0/go.mod h1:LsfDQRkwJRHOSHNnM1/pdi/6EQNj41WpIxpZRqSdI0E= +go.opentelemetry.io/collector/config/configauth v0.87.0 h1:FufZLHvJ+VcAM2xi404TpuYnpO1Rmeq7XtHleQLavrs= +go.opentelemetry.io/collector/config/configauth v0.87.0/go.mod h1:xT8mIo1b57j0znSOssEFaJtE3rGw/kTZZucP5lEw6OU= +go.opentelemetry.io/collector/config/configcompression v0.87.0 h1:hWRT47RJbjbowDGQMXQO/dt/pzyYjMcf+rroW8b8fws= +go.opentelemetry.io/collector/config/configcompression v0.87.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag= +go.opentelemetry.io/collector/config/configgrpc v0.87.0 h1:5fH+ja4hLGoYww1RG+bpJVVAzdlAvrGiQjy7tEo3YJ0= +go.opentelemetry.io/collector/config/configgrpc v0.87.0/go.mod h1:0Iv6apeYihw6MKsC6p/rYLxLfO/9ZRmZ1GL0d4LxnII= +go.opentelemetry.io/collector/config/confighttp v0.87.0 h1:FOC4ArxbvJRiwABXsv/bSrRlD3m9nAEAACEYXmpNC+g= +go.opentelemetry.io/collector/config/confighttp v0.87.0/go.mod h1:Vt4DECSuhncd/bTKU3pB6MUjHwBKfPqiIkFg5fHJHIE= +go.opentelemetry.io/collector/config/confignet v0.87.0 h1:ULV44732QN0wTCtSIdYG04I+6wjZWzOCme/J4pqKYWg= +go.opentelemetry.io/collector/config/confignet v0.87.0/go.mod h1:cpO8JYWGONaViOygKVw+Hd2UoBcn2cUiyi0WWeFTwJY= +go.opentelemetry.io/collector/config/configopaque v0.87.0 h1:+qqJG1oEzX4+/YNbgeaXW9YM0BPWSj5XCi5y2zZLhDY= +go.opentelemetry.io/collector/config/configopaque v0.87.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY= +go.opentelemetry.io/collector/config/configtelemetry v0.87.0 h1:xUqayM9b41OvXkjU3p8RkUr8hUrCjfDUmO+oKhRNSwc= +go.opentelemetry.io/collector/config/configtelemetry v0.87.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= +go.opentelemetry.io/collector/config/configtls v0.87.0 h1:EXa9Plr74+r9t2/59dTyjR3y53zqwigHN0dQsI8VGiQ= +go.opentelemetry.io/collector/config/configtls v0.87.0/go.mod h1:3UoeynehS/NNhg1Qbt3xQdgPyrkWnjBRLUG2Gw7BFFc= +go.opentelemetry.io/collector/config/internal v0.87.0 h1:wffyWbpanr2HFQaPPp5bG62KqJYlw5EdPxwR0iG+Lbo= +go.opentelemetry.io/collector/config/internal v0.87.0/go.mod h1:42VsQ/1kP2qnvzjNi+dfNP+KyCFRADejyrJ8m2GVL3M= +go.opentelemetry.io/collector/confmap v0.87.0 h1:LFnyDKIOMtlJm5EsdcFN2t0rcU/QLbS9QEs/awM2HOA= +go.opentelemetry.io/collector/confmap v0.87.0/go.mod h1:inqYRP70+bMrUwGGnuhcWyyufxyU3VQT6rl3/EX0f+g= +go.opentelemetry.io/collector/connector v0.87.0 h1:Y00shHpxBSxliE/liJex2JMdYpJxbakfCUbaXe9eVMU= +go.opentelemetry.io/collector/connector v0.87.0/go.mod h1:qk+c3IeAdRkpUjXLh3PqAnC8BkKuMF7EhA5GpGNu7AI= +go.opentelemetry.io/collector/consumer v0.87.0 h1:oR5XKZoVF/hwz0FnrYPaHcbbQazHifMsxpENMR7ivvo= +go.opentelemetry.io/collector/consumer v0.87.0/go.mod h1:lui5rg1byAT7QPbCY733StCDc/TPxS3hVNXKoVQ3LsI= +go.opentelemetry.io/collector/exporter v0.87.0 h1:DZ0QT2yp1qACmHMxs6W2ho5RPqdevCx9R/LFCxnxi9w= +go.opentelemetry.io/collector/exporter v0.87.0/go.mod h1:SGobdCR0xwQElJT2Sbofo7BprMlV8XeXdsNP9fsNaKY= +go.opentelemetry.io/collector/exporter/loggingexporter v0.87.0 h1:F/WkglGgCSHOFYjafYEAwD/qGpZ5HpawLMWu/Jcf0SE= +go.opentelemetry.io/collector/exporter/loggingexporter v0.87.0/go.mod h1:rYi0mKzgRH6xwsrYN9gb+WBccfoP1SpJ9U0xklrhV7g= +go.opentelemetry.io/collector/exporter/otlpexporter v0.87.0 h1:1seSC+OX1QnbpED0Kuo1DbWQSER+vy88yp4zxBubY4A= +go.opentelemetry.io/collector/exporter/otlpexporter v0.87.0/go.mod h1:Q4aS69GcAdcJLssnEd8ddt2rX97s/CkW/n1DdgdIaHQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.87.0 h1:EqexJl7mzozDw4KY9mzR14uij0QlB9zIg8CfNGJYNt0= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.87.0/go.mod h1:uwNO6qMa82a0EeokQx3YEiMl+R8HJulaDpUSS6T3pkg= +go.opentelemetry.io/collector/extension v0.87.0 h1:EMIaEequ5rjWzoid6vNImjQGVMfzbME+8JSa5XACYKs= +go.opentelemetry.io/collector/extension v0.87.0/go.mod h1:D3srNZC99QVTAdLNUVuqfmmgJge4sQHDrnt5XWscvxI= +go.opentelemetry.io/collector/extension/auth v0.87.0 h1:na1OumQSd5l+JvUiMr3oaiW6fuiDr7mEnydwQwmE+nk= +go.opentelemetry.io/collector/extension/auth v0.87.0/go.mod h1:b7T9VefuK1GzSp5z1yjbkAvTxpWvflUmYoawTcGGuOs= +go.opentelemetry.io/collector/extension/zpagesextension v0.87.0 h1:vSaCojdWMq34LDw2qR6To0PkSe4p+1BtP2Xr37PHH7w= +go.opentelemetry.io/collector/extension/zpagesextension v0.87.0/go.mod h1:aXIFi7aIGD2uQCJPCF8uRSPJEK0+jjiZfvOehNGA1ZU= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0016 h1:/6N9990tbjotvXgrXpV5AbaFiyxTdFEXDypGBHVDSQM= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0016/go.mod h1:fLmJMf1AoHttkF8p5oJAc4o5ZpHu8yO5XYJ7gbLCLzo= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 h1:qCPXSQCoD3qeWFb1RuIks8fw9Atxpk78bmtVdi15KhE= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016/go.mod h1:OdN0alYOlYhHXu6BDlGehrZWgtBuiDsz/rlNeJeXiNg= +go.opentelemetry.io/collector/processor v0.87.0 h1:aUGtRyeQk0WgQwp2rZBvJ1j+6+WJO8XMb1kjtanIWo8= +go.opentelemetry.io/collector/processor v0.87.0/go.mod h1:FHqpqdm/uyjjhNQxXJBhvQDIwjnP01EW9M6t0xVaRR4= +go.opentelemetry.io/collector/processor/batchprocessor v0.87.0 h1:/a2yjC8XMg1j/9hnpDbxTKbG/AyWac2xsQSx0PmFz1M= +go.opentelemetry.io/collector/processor/batchprocessor v0.87.0/go.mod h1:uY8Lu7zFtNZC39ylu8bphgqO0c3VIqVdegKxXlHo9Po= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.87.0 h1:pWR4fPyKOBo0YWi745pai6ae7jFdlRvRiEg7VmtpGNw= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.87.0/go.mod h1:Id8f4KVl5p5Uzn7RlfFwufdaiINQTKILcTCLQFsSH6c= +go.opentelemetry.io/collector/receiver v0.87.0 h1:4HpA5Rxb1jcMywCB8y5aNTXiqSt3n7oaFLfQbAkSaWM= +go.opentelemetry.io/collector/receiver v0.87.0/go.mod h1:uApnlS81KGGfQJrzbCdBZWsB5DQJgcPTsYlb9CFdE3s= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.87.0 h1:iXO30EKZwEP1TEuLlQjxVaeVeffDkdJqz9DuqjzME9c= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.87.0/go.mod h1:1IE82wJuyGW0z0BeJ3A0SoPxsPlqf9aefCycbtuxUO0= +go.opentelemetry.io/collector/semconv v0.87.0 h1:BsG1jdLLRCBRlvUujk4QA86af7r/ZXnizczQpEs/gg8= +go.opentelemetry.io/collector/semconv v0.87.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0 h1:CaagQrotQLgtDlHU6u9pE/Mf4mAwiLD8wrReIVt06lY= go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0/go.mod h1:LOjFy00/ZMyMYfKFPta6kZe2cDUc1sNo/qtv1pSORWA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0/go.mod h1:1WpsUwjQrUJSNugfMlPn0rPRJ9Do7wwBgTBPK7MLiS4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 h1:HKORGpiOY0R0nAPtKx/ub8/7XoHhRooP8yNRkuPfelI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0/go.mod h1:e+y1M74SYXo/FcIx3UATwth2+5dDkM8dBi7eXg1tbw8= -go.opentelemetry.io/contrib/propagators/b3 v1.17.0 h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo= -go.opentelemetry.io/contrib/propagators/b3 v1.17.0/go.mod h1:IkfUfMpKWmynvvE0264trz0sf32NRTZL4nuAN9AbWRc= -go.opentelemetry.io/contrib/zpages v0.43.0 h1:3Vp9HDMY/lGe7UY8fDRGmwddCoAb7cACiAL2joIdJh8= -go.opentelemetry.io/contrib/zpages v0.43.0/go.mod h1:goHRllQ1dASJ4KlVnIrTaWrFUIBbK1CMiGS10UF++VI= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 h1:RsQi0qJ2imFfCvZabqzM9cNXBG8k6gXMv1A0cXRmH6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0/go.mod h1:vsh3ySueQCiKPxFLvjWC4Z135gIa34TQ/NSqkDTZYUM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q= +go.opentelemetry.io/contrib/propagators/b3 v1.19.0 h1:ulz44cpm6V5oAeg5Aw9HyqGFMS6XM7untlMEhD7YzzA= +go.opentelemetry.io/contrib/propagators/b3 v1.19.0/go.mod h1:OzCmE2IVS+asTI+odXQstRGVfXQ4bXv9nMBRK0nNyqQ= +go.opentelemetry.io/contrib/zpages v0.45.0 h1:jIwHHGoWzJoZdbIUtWdErjL85Gni6BignnAFqDtMRL4= +go.opentelemetry.io/contrib/zpages v0.45.0/go.mod h1:4mIdA5hqH6hEx9sZgV50qKfQO8aIYolUZboHmz+G7vw= go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= -go.opentelemetry.io/otel/bridge/opencensus v0.40.0 h1:pqDiayRhBgoqy1vwnscik+TizcImJ58l053NScJyZso= -go.opentelemetry.io/otel/bridge/opencensus v0.40.0/go.mod h1:1NvVHb6tLTe5A9qCYz+eErW0t8iPn4ZfR6tDKcqlGTM= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 h1:MZbjiZeMmn5wFMORhozpouGKDxj9POHTuU5UA8msBQk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0/go.mod h1:C7tOYVCJmrDTCwxNny0MuUtnDIR3032vFHYke0F2ZrU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 h1:q3FNPi8FLQVjLlmV+WWHQfH9ZCCtQIS0O/+dn1+4cJ4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0/go.mod h1:rmx4n0uSIAkKBeQYkygcv9dENAlL2/tv3OSq68h1JAo= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 h1:SZaSbubADNhH2Gxm+1GaZ/cFsGiYefZoodMMX79AOd4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0/go.mod h1:N65FzQDfQH7NY7umgb0U+7ypGKVYKwwE24L6KXT4OA8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0/go.mod h1:aFsJfCEnLzEu9vRRAcUiB/cpRTbVsNdF3OHSPpdjxZQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 h1:iGeIsSYwpYSvh5UGzWrJfTDJvPjrXtxl3GUppj6IXQU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0/go.mod h1:1j3H3G1SBYpZFti6OI4P0uRQCW20MXkG5v4UWXppLLE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 h1:kvWMtSUNVylLVrOE4WLUmBtgziYoCIYUNSpTYtMzVJI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0/go.mod h1:SExUrRYIXhDgEKG4tkiQovd2HTaELiHUsuK08s5Nqx4= -go.opentelemetry.io/otel/exporters/prometheus v0.40.1-0.20230831181707-02616a25c68e h1:eh19+pVw4g/V7QM/8iNDk3M5cNy3mOVzggEgdlt9jkY= -go.opentelemetry.io/otel/exporters/prometheus v0.40.1-0.20230831181707-02616a25c68e/go.mod h1:5USWZ0ovyQB5CIM3IO3bGRSoDPMXiT3t+15gu8Zo9HQ= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0 h1:hf7JSONqAuXT1PDYYlVhKNMPLe4060d+4RFREcv7X2c= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0/go.mod h1:IxD5qbw/XcnFB7i5k4d7J1aW5iBU2h4DgSxtk4YqR4c= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0 h1:Ut6hgtYcASHwCzRHkXEtSsM251cXJPW+Z9DyLwEn6iI= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0/go.mod h1:TYeE+8d5CjrgBa0ZuRaDeMpIC1xZ7atg4g+nInjuSjc= +go.opentelemetry.io/otel/bridge/opencensus v0.42.0 h1:QvC+bcZkWMphWPiVqRQygMj6M0/3TOuJEO+erRA7kI8= +go.opentelemetry.io/otel/bridge/opencensus v0.42.0/go.mod h1:XJojP7g5DqYdiyArix/H9i1XzPPlIUc9dGLKtF9copI= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 h1:ZtfnDL+tUrs1F0Pzfwbg2d59Gru9NCH3bgSHBM6LDwU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0/go.mod h1:hG4Fj/y8TR/tlEDREo8tWstl9fO9gcFkn4xrx0Io8xU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 h1:NmnYCiR0qNufkldjVvyQfZTHSdzeHoZ41zggMsdMcLM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0/go.mod h1:UVAO61+umUsHLtYb8KXXRoHtxUkdOPkYidzW3gipRLQ= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 h1:wNMDy/LVGLj2h3p6zg4d0gypKfWKSWI14E1C4smOgl8= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0/go.mod h1:YfbDdXAAkemWJK3H/DshvlrxqFB2rtW4rY6ky/3x/H0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= +go.opentelemetry.io/otel/exporters/prometheus v0.42.0 h1:jwV9iQdvp38fxXi8ZC+lNpxjK16MRcZlpDYvbuO1FiA= +go.opentelemetry.io/otel/exporters/prometheus v0.42.0/go.mod h1:f3bYiqNqhoPxkvI2LrXqQVC546K7BuRDL/kKuxkujhA= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0 h1:4jJuoeOo9W6hZnz+r046fyoH5kykZPRvKfUXJVfMpB0= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0/go.mod h1:/MtYTE1SfC2QIcE0bDot6fIX+h+WvXjgTqgn9P0LNPE= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0 h1:Nw7Dv4lwvGrI68+wULbcq7su9K2cebeCUrDjVrUJHxM= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0/go.mod h1:1MsF6Y7gTqosgoZvHlzcaaM8DIMNZgJh87ykokoNH7Y= go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= -go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= -go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= -go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU= -go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs= +go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= +go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= +go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k= +go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY= go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -2449,8 +2455,8 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= go4.org/netipx v0.0.0-20230125063823-8449b0a6169f h1:ketMxHg+vWm3yccyYiq+uK8D3fRmna2Fcj+awpQp84s= go4.org/netipx v0.0.0-20230125063823-8449b0a6169f/go.mod h1:tgPU4N2u9RByaTN3NC2p9xOzyFpte4jYwsIIRF7XlSc= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -2542,8 +2548,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2638,8 +2644,8 @@ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= -golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2655,8 +2661,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2785,6 +2791,7 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -2903,8 +2910,8 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= -golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2953,8 +2960,8 @@ google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00 google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.139.0 h1:A1TrCPgMmOiYu0AiNkvQIpIx+D8blHTDcJ5EogkP7LI= -google.golang.org/api v0.139.0/go.mod h1:CVagp6Eekz9CjGZ718Z+sloknzkDJE7Vc1Ckj9+viBk= +google.golang.org/api v0.146.0 h1:9aBYT4vQXt9dhCuLNfwfd3zpwu8atg0yPkjBymwSrOM= +google.golang.org/api v0.146.0/go.mod h1:OARJqIfoYjXJj4C1AiBSXYZt03qsoz8FQYU6fBEfrHM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -3027,12 +3034,12 @@ google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTbz4Zk2h7Mh+eis4nfJEFQFYzJzuIA= +google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= google.golang.org/grpc v0.0.0-20180920234847-8997b5fa0873/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -3166,8 +3173,8 @@ k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= -k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= +k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= +k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= k8s.io/apiextensions-apiserver v0.28.0 h1:CszgmBL8CizEnj4sj7/PtLGey6Na3YgWyGCPONv7E9E= k8s.io/apiextensions-apiserver v0.28.0/go.mod h1:uRdYiwIuu0SyqJKriKmqEN2jThIJPhVmOWETm8ud1VE= k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= @@ -3175,12 +3182,12 @@ k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod h1:ccL7Eh7zubPUSh9 k8s.io/apimachinery v0.17.1/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= -k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= +k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= +k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= -k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= +k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= +k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/component-base v0.28.1 h1:LA4AujMlK2mr0tZbQDZkjWbdhTV5bRyEyAFe0TJxlWg= k8s.io/component-base v0.28.1/go.mod h1:jI11OyhbX21Qtbav7JkhehyBsIRfnO8oEgoAR12ArIU= @@ -3206,8 +3213,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/controller-runtime v0.16.1 h1:+15lzrmHsE0s2kNl0Dl8cTchI5Cs8qofo5PGcPrV9z0= -sigs.k8s.io/controller-runtime v0.16.1/go.mod h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU= +sigs.k8s.io/controller-runtime v0.16.2 h1:mwXAVuEk3EQf478PQwQ48zGOXvW27UJc8NHktQVuIPU= +sigs.k8s.io/controller-runtime v0.16.2/go.mod h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= diff --git a/pkg/traces/config.go b/pkg/traces/config.go index dd55cb3a538a..be9adf1f56a9 100644 --- a/pkg/traces/config.go +++ b/pkg/traces/config.go @@ -124,15 +124,15 @@ type InstanceConfig struct { RemoteWrite []RemoteWriteConfig `yaml:"remote_write,omitempty"` // Receivers: - // https://github.com/open-telemetry/opentelemetry-collector/blob/v0.85.0/receiver/README.md + // https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/receiver/README.md Receivers ReceiverMap `yaml:"receivers,omitempty"` // Batch: - // https://github.com/open-telemetry/opentelemetry-collector/tree/v0.85.0/processor/batchprocessor + // https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/processor/batchprocessor Batch map[string]interface{} `yaml:"batch,omitempty"` // Attributes: - // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor + // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor Attributes map[string]interface{} `yaml:"attributes,omitempty"` // prom service discovery config @@ -141,25 +141,25 @@ type InstanceConfig struct { PodAssociations []string `yaml:"prom_sd_pod_associations,omitempty"` // SpanMetricsProcessor: - // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/spanmetricsprocessor + // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/spanmetricsprocessor SpanMetrics *SpanMetricsConfig `yaml:"spanmetrics,omitempty"` // AutomaticLogging AutomaticLogging *automaticloggingprocessor.AutomaticLoggingConfig `yaml:"automatic_logging,omitempty"` // TailSampling defines a sampling strategy for the pipeline - // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/tailsamplingprocessor + // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/tailsamplingprocessor TailSampling *tailSamplingConfig `yaml:"tail_sampling,omitempty"` // LoadBalancing is used to distribute spans of the same trace to the same agent instance - // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/exporter/loadbalancingexporter + // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/exporter/loadbalancingexporter LoadBalancing *loadBalancingConfig `yaml:"load_balancing"` // ServiceGraphs ServiceGraphs *serviceGraphsConfig `yaml:"service_graphs,omitempty"` // Jaeger's Remote Sampling extension: - // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/extension/jaegerremotesampling + // https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/extension/jaegerremotesampling JaegerRemoteSampling []JaegerRemoteSamplingConfig `yaml:"jaeger_remote_sampling"` } @@ -325,8 +325,8 @@ type RemoteWriteConfig struct { BasicAuth *prom_config.BasicAuth `yaml:"basic_auth,omitempty"` Oauth2 *OAuth2Config `yaml:"oauth2,omitempty"` Headers map[string]string `yaml:"headers,omitempty"` - SendingQueue map[string]interface{} `yaml:"sending_queue,omitempty"` // https://github.com/open-telemetry/opentelemetry-collector/blob/v0.85.0/exporter/exporterhelper/queued_retry.go - RetryOnFailure map[string]interface{} `yaml:"retry_on_failure,omitempty"` // https://github.com/open-telemetry/opentelemetry-collector/blob/v0.85.0/exporter/exporterhelper/queued_retry.go + SendingQueue map[string]interface{} `yaml:"sending_queue,omitempty"` // https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/exporter/exporterhelper/queued_retry.go + RetryOnFailure map[string]interface{} `yaml:"retry_on_failure,omitempty"` // https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/exporter/exporterhelper/queued_retry.go } // UnmarshalYAML implements yaml.Unmarshaler. @@ -379,7 +379,7 @@ type SpanMetricsConfig struct { // tailSamplingConfig is the configuration for tail-based sampling type tailSamplingConfig struct { // Policies are the strategies used for sampling. Multiple policies can be used in the same pipeline. - // For more information, refer to https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/tailsamplingprocessor + // For more information, refer to https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/tailsamplingprocessor Policies []policy `yaml:"policies"` // DecisionWait defines the time to wait for a complete trace before making a decision DecisionWait time.Duration `yaml:"decision_wait,omitempty"` @@ -622,7 +622,7 @@ func (c *InstanceConfig) loadBalancingExporter() (map[string]interface{}, error) } // formatPolicies creates sampling policies (i.e. rules) compatible with OTel's tail sampling processor -// https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.85.0/processor/tailsamplingprocessor +// https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/tailsamplingprocessor func formatPolicies(cfg []policy) ([]map[string]interface{}, error) { policies := make([]map[string]interface{}, 0, len(cfg)) for i, policy := range cfg { diff --git a/pkg/traces/servicegraphprocessor/processor_test.go b/pkg/traces/servicegraphprocessor/processor_test.go index a2577a3d034d..935aed9232b9 100644 --- a/pkg/traces/servicegraphprocessor/processor_test.go +++ b/pkg/traces/servicegraphprocessor/processor_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + otelcomponent "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/ptrace" otelprocessor "go.opentelemetry.io/collector/processor" @@ -81,6 +82,10 @@ func TestConsumeMetrics(t *testing.T) { ID: component.NewID("FakeID"), TelemetrySettings: component.TelemetrySettings{ MeterProvider: getTestMeterProvider(t, reg), + + ReportComponentStatus: func(*otelcomponent.StatusEvent) error { + return nil + }, }, BuildInfo: component.BuildInfo{}, } From 8a7921844e809da330639efa46858a4d737b013b Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Wed, 18 Oct 2023 20:35:37 +0100 Subject: [PATCH 2/7] Fix feature gate unit test --- pkg/util/otel_feature_gate_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/util/otel_feature_gate_test.go b/pkg/util/otel_feature_gate_test.go index 76fd8ef1f72f..d4b49ea92c91 100644 --- a/pkg/util/otel_feature_gate_test.go +++ b/pkg/util/otel_feature_gate_test.go @@ -5,6 +5,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/featuregate" + + // Register the feature gates. + _ "go.opentelemetry.io/collector/exporter/exporterhelper" ) func Test_FeatureGates(t *testing.T) { From 9df05344d158044e96db14ff00d7b2fc2a618d40 Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Thu, 19 Oct 2023 09:20:01 +0100 Subject: [PATCH 3/7] Update docs/sources/flow/reference/components/otelcol.receiver.kafka.md Co-authored-by: Mischa Thompson --- .../sources/flow/reference/components/otelcol.receiver.kafka.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/flow/reference/components/otelcol.receiver.kafka.md b/docs/sources/flow/reference/components/otelcol.receiver.kafka.md index aa45d353f90d..4c332641a990 100644 --- a/docs/sources/flow/reference/components/otelcol.receiver.kafka.md +++ b/docs/sources/flow/reference/components/otelcol.receiver.kafka.md @@ -272,7 +272,7 @@ The following arguments are supported: Name | Type | Description | Default | Required ---- | ---- | ----------- | ------- | -------- `extract_headers` | `bool` | Enables attaching header fields to resource attributes. | `false` | no -`headers` | `list(string)` | A list of headers to extract from the Kafka record. | `[]]` | no +`headers` | `list(string)` | A list of headers to extract from the Kafka record. | `[]` | no Regular expressions are not allowed in the `headers` argument. Only exact matching will be performed. From 3548ac0ef89e9510bbf76f19ebd94d2e595381d9 Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Thu, 19 Oct 2023 11:15:10 +0100 Subject: [PATCH 4/7] Parametrize the OTel version in docs. --- docs/developer/updating-otel.md | 1 + docs/sources/_index.md | 1 + docs/sources/_index.md.t | 1 + .../components/otelcol.processor.transform.md | 48 +++++++++---------- .../static/configuration/traces-config.md | 34 ++++++------- 5 files changed, 44 insertions(+), 41 deletions(-) diff --git a/docs/developer/updating-otel.md b/docs/developer/updating-otel.md index 6b59e6d805bc..6770f3c30328 100644 --- a/docs/developer/updating-otel.md +++ b/docs/developer/updating-otel.md @@ -83,6 +83,7 @@ Unfortunately, updating Otel dependencies is not straightforward: whether it is really necessary. * Search the Agent repository for the old version (e.g. "0.87") to find code and documentation which also needs updating. + * Update the `OTEL_VERSION` parameter in the `docs/sources/_index.md.t` file. 5. Some Agent components reuse OpenTelemetry code, but do not import it: * `otelcol.extension.jaeger_remote_sampling`: a lot of this code has been copy-pasted from Otel and modified slightly to fit the Agent's needs. diff --git a/docs/sources/_index.md b/docs/sources/_index.md index a87bbbdd7eaf..6f2d00508349 100644 --- a/docs/sources/_index.md +++ b/docs/sources/_index.md @@ -9,6 +9,7 @@ description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry weight: 350 cascade: AGENT_RELEASE: v0.37.2 + OTEL_VERSION: v0.87.0 --- # Grafana Agent diff --git a/docs/sources/_index.md.t b/docs/sources/_index.md.t index 2301f07a4107..276c3b5b6912 100644 --- a/docs/sources/_index.md.t +++ b/docs/sources/_index.md.t @@ -9,6 +9,7 @@ description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry weight: 350 cascade: AGENT_RELEASE: $AGENT_VERSION + OTEL_VERSION: v0.87.0 --- # Grafana Agent diff --git a/docs/sources/flow/reference/components/otelcol.processor.transform.md b/docs/sources/flow/reference/components/otelcol.processor.transform.md index 563fdc016954..b54755710a04 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.transform.md +++ b/docs/sources/flow/reference/components/otelcol.processor.transform.md @@ -73,9 +73,9 @@ to a new metric data type or can be used to create new metrics. - [Orphaned Telemetry][]: The processor allows you to modify `span_id`, `trace_id`, and `parent_span_id` for traces and `span_id`, and `trace_id` logs. Modifying these fields could lead to orphaned spans or logs. -[Unsound Transformations]: https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/docs/standard-warnings.md#unsound-transformations -[Identity Conflict]: https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/docs/standard-warnings.md#identity-conflict -[Orphaned Telemetry]: https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/docs/standard-warnings.md#orphaned-telemetry +[Unsound Transformations]: https://github.com/open-telemetry/opentelemetry-collector/blob/{{< param "OTEL_VERSION" >}}/docs/standard-warnings.md#unsound-transformations +[Identity Conflict]: https://github.com/open-telemetry/opentelemetry-collector/blob/{{< param "OTEL_VERSION" >}}/docs/standard-warnings.md#identity-conflict +[Orphaned Telemetry]: https://github.com/open-telemetry/opentelemetry-collector/blob/{{< param "OTEL_VERSION" >}}/docs/standard-warnings.md#orphaned-telemetry [no-op]: https://en.wikipedia.org/wiki/NOP_(code) [metrics data model]: https://github.com/open-telemetry/opentelemetry-specification/blob/main//specification/metrics/data-model.md {{% /admonition %}} @@ -552,24 +552,24 @@ Some values in the River strings are [escaped][river-strings]: [river-strings]: {{< relref "../../config-language/expressions/types_and_values.md/#strings" >}} -[traces protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v0.17.0/opentelemetry/proto/trace/v1/trace.proto -[metrics protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v0.17.0/opentelemetry/proto/metrics/v1/metrics.proto -[logs protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v0.17.0/opentelemetry/proto/logs/v1/logs.proto - - -[OTTL]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/README.md -[OTTL functions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/ottlfuncs/README.md -[convert_sum_to_gauge]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/transformprocessor#convert_sum_to_gauge -[convert_gauge_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/transformprocessor#convert_gauge_to_sum -[convert_summary_count_val_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/transformprocessor#convert_summary_count_val_to_sum -[convert_summary_sum_val_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/transformprocessor#convert_summary_sum_val_to_sum -[OTTL booleans]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/pkg/ottl#booleans -[OTTL math expressions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/pkg/ottl#math-expressions -[OTTL boolean expressions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/pkg/ottl#boolean-expressions -[OTTL resource context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlresource/README.md -[OTTL scope context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlscope/README.md -[OTTL span context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlspan/README.md -[OTTL spanevent context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlspanevent/README.md -[OTTL metric context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottlmetric/README.md -[OTTL datapoint context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottldatapoint/README.md -[OTTL log context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/ottl/contexts/ottllog/README.md +[traces protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v1.0.0/opentelemetry/proto/trace/v1/trace.proto +[metrics protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v1.0.0/opentelemetry/proto/metrics/v1/metrics.proto +[logs protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v1.0.0/opentelemetry/proto/logs/v1/logs.proto + + +[OTTL]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/pkg/ottl/README.md +[OTTL functions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/pkg/ottl/ottlfuncs/README.md +[convert_sum_to_gauge]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/processor/transformprocessor#convert_sum_to_gauge +[convert_gauge_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/processor/transformprocessor#convert_gauge_to_sum +[convert_summary_count_val_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/processor/transformprocessor#convert_summary_count_val_to_sum +[convert_summary_sum_val_to_sum]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/processor/transformprocessor#convert_summary_sum_val_to_sum +[OTTL booleans]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/pkg/ottl#booleans +[OTTL math expressions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/pkg/ottl#math-expressions +[OTTL boolean expressions]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/pkg/ottl#boolean-expressions +[OTTL resource context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/pkg/ottl/contexts/ottlresource/README.md +[OTTL scope context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/pkg/ottl/contexts/ottlscope/README.md +[OTTL span context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/pkg/ottl/contexts/ottlspan/README.md +[OTTL spanevent context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/pkg/ottl/contexts/ottlspanevent/README.md +[OTTL metric context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/pkg/ottl/contexts/ottlmetric/README.md +[OTTL datapoint context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/pkg/ottl/contexts/ottldatapoint/README.md +[OTTL log context]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/pkg/ottl/contexts/ottllog/README.md diff --git a/docs/sources/static/configuration/traces-config.md b/docs/sources/static/configuration/traces-config.md index 75a89cd32e50..682ce51f5741 100644 --- a/docs/sources/static/configuration/traces-config.md +++ b/docs/sources/static/configuration/traces-config.md @@ -70,7 +70,7 @@ remote_write: # Only grpc/otlp is supported in Grafana Cloud. [ format: | default = "otlp" | supported = "otlp" ] - # Controls whether or not TLS is required. See https://godoc.org/google.golang.org/grpc#WithInsecure + # Controls whether or not TLS is required. See https://godoc.org/google.golang.org/grpc#WithInsecure [ insecure: | default = false ] # Deprecated in favor of tls_config @@ -80,7 +80,7 @@ remote_write: # Configures opentelemetry exporters to use the OpenTelemetry auth extension `oauth2clientauthextension`. # Can not be used in combination with `basic_auth`. - # See https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/extension/oauth2clientauthextension/README.md + # See https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/extension/oauth2clientauthextension/README.md oauth2: # Configures the TLS settings specific to the oauth2 client # The client identifier issued to the oauth client @@ -96,7 +96,7 @@ remote_write: # Optional, specifies the timeout fetching tokens from the token_url. Default: no timeout [ timeout: ] # TLS client configuration for the underneath client to authorization server. - # https://github.com/open-telemetry/opentelemetry-collector/blob/v0.87.0/config/configtls/README.md + # https://github.com/open-telemetry/opentelemetry-collector/blob/{{< param "OTEL_VERSION" >}}/config/configtls/README.md tls: # Disable validation of the server certificate. [ insecure: | default = false ] @@ -191,7 +191,7 @@ automatic_logging: # Receiver configurations are mapped directly into the OpenTelemetry receivers # block. At least one receiver is required. -# The Agent uses OpenTelemetry v0.87.0. Refer to the corresponding receiver's config. +# The Agent uses OpenTelemetry {{< param "OTEL_VERSION" >}}. Refer to the corresponding receiver's config. # # Supported receivers: otlp, jaeger, kafka, opencensus and zipkin. receivers: @@ -419,7 +419,7 @@ service_graphs: # jaeger_remote_sampling configures one or more jaeger remote sampling extensions. # For more details about the configuration please consult the OpenTelemetry documentation: -# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/extension/jaegerremotesampling +# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/extension/jaegerremotesampling # # Example config: # @@ -439,17 +439,17 @@ jaeger_remote_sampling: More information on the following types can be found on the documentation for their respective projects: -* [`attributes.config`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/attributesprocessor) -* [`batch.config`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/processor/batchprocessor) -* [`otlpexporter.sending_queue`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/exporter/otlpexporter) -* [`otlpexporter.retry_on_failure`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/exporter/otlpexporter) +* [`attributes.config`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/processor/attributesprocessor) +* [`batch.config`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/{{< param "OTEL_VERSION" >}}/processor/batchprocessor) +* [`otlpexporter.sending_queue`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/{{< param "OTEL_VERSION" >}}/exporter/otlpexporter) +* [`otlpexporter.retry_on_failure`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/{{< param "OTEL_VERSION" >}}/exporter/otlpexporter) * `receivers`: - * [`jaegerreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/receiver/jaegerreceiver) - * [`kafkareceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/receiver/kafkareceiver) - * [`otlpreceiver`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/receiver/otlpreceiver) - * [`opencensusreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/receiver/opencensusreceiver) - * [`zipkinreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/receiver/zipkinreceiver) + * [`jaegerreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/receiver/jaegerreceiver) + * [`kafkareceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/receiver/kafkareceiver) + * [`otlpreceiver`: OpenTelemetry-Collector](https://github.com/open-telemetry/opentelemetry-collector/tree/{{< param "OTEL_VERSION" >}}/receiver/otlpreceiver) + * [`opencensusreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/receiver/opencensusreceiver) + * [`zipkinreceiver`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/receiver/zipkinreceiver) * [`scrape_config`: Prometheus](https://prometheus.io/docs/prometheus/2.45/configuration/configuration/#scrape_config) -* [`spanmetricsprocessor.latency_histogram_buckets`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/processor/spanmetricsprocessor/config.go#L37-L39) -* [`spanmetricsprocessor.dimensions`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/processor/spanmetricsprocessor/config.go#L41-L48) -* [`tailsamplingprocessor.policies`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.87.0/processor/tailsamplingprocessor) +* [`spanmetricsprocessor.latency_histogram_buckets`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/processor/spanmetricsprocessor/config.go#L37-L39) +* [`spanmetricsprocessor.dimensions`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/{{< param "OTEL_VERSION" >}}/processor/spanmetricsprocessor/config.go#L41-L48) +* [`tailsamplingprocessor.policies`: OpenTelemetry-Collector-Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/{{< param "OTEL_VERSION" >}}/processor/tailsamplingprocessor) From 20fa44e893804c352b45122e75fecf340a65acb5 Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Thu, 19 Oct 2023 11:54:43 +0100 Subject: [PATCH 5/7] Document another batch processor metric --- .../sources/flow/reference/components/otelcol.processor.batch.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sources/flow/reference/components/otelcol.processor.batch.md b/docs/sources/flow/reference/components/otelcol.processor.batch.md index eccbc0923602..5216d88259fb 100644 --- a/docs/sources/flow/reference/components/otelcol.processor.batch.md +++ b/docs/sources/flow/reference/components/otelcol.processor.batch.md @@ -125,6 +125,7 @@ information. * `processor_batch_batch_send_size_ratio` (histogram): Number of units in the batch. * `processor_batch_metadata_cardinality_ratio` (gauge): Number of distinct metadata value combinations being processed. * `processor_batch_timeout_trigger_send_ratio_total` (counter): Number of times the batch was sent due to a timeout trigger. +* `processor_batch_batch_size_trigger_send_ratio_total` (counter): Number of times the batch was sent due to a size trigger. ## Examples From 8b461293ad49b7d06bbda7e1125d85d1917f1c90 Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Tue, 24 Oct 2023 17:43:24 +0100 Subject: [PATCH 6/7] Don't accept routing keys for metrics. --- .../exporter/loadbalancing/loadbalancing.go | 18 ++++++++++++++++++ .../otelcol.exporter.loadbalancing.md | 18 ++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/component/otelcol/exporter/loadbalancing/loadbalancing.go b/component/otelcol/exporter/loadbalancing/loadbalancing.go index e44841425b35..5fee871a7f03 100644 --- a/component/otelcol/exporter/loadbalancing/loadbalancing.go +++ b/component/otelcol/exporter/loadbalancing/loadbalancing.go @@ -2,6 +2,7 @@ package loadbalancing import ( + "fmt" "time" "github.com/alecthomas/units" @@ -48,6 +49,7 @@ type Arguments struct { var ( _ exporter.Arguments = Arguments{} _ river.Defaulter = &Arguments{} + _ river.Validator = &Arguments{} ) var ( @@ -72,6 +74,22 @@ func (args *Arguments) SetToDefault() { *args = DefaultArguments } +// Validate implements river.Validator. +func (args *Arguments) Validate() error { + //TODO(ptodev): Add support for "resource" and "metric" routing keys later. + // The reason we can't add them yet is that otelcol.exporter.loadbalancing + // is labeled as "beta", but those routing keys are experimental. + // We need a way to label otelcol.exporter.loadbalancing as "beta" + // for logs and traces, but "experimental" for metrics. + switch args.RoutingKey { + case "service", "traceID": + // The routing key is valid. + default: + return fmt.Errorf("invalid routing key %q", args.RoutingKey) + } + return nil +} + // Convert implements exporter.Arguments. func (args Arguments) Convert() (otelcomponent.Config, error) { return &loadbalancingexporter.Config{ diff --git a/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md b/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md index e3279fd5f6cd..9b9073dc6501 100644 --- a/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md +++ b/docs/sources/flow/reference/components/otelcol.exporter.loadbalancing.md @@ -65,20 +65,10 @@ Name | Type | Description | Default | Required `routing_key` | `string` | Routing strategy for load balancing. | `"traceID"` | no The `routing_key` attribute determines how to route signals across endpoints. Its value could be one of the following: -* `"service"`: - * Works for logs, spans, and metrics. - * Signals with the same `service.name` will be exported to the same backend. - This is useful when using processors like the span metrics, so all spans for each service are sent to consistent Agent instances - for metric collection. Otherwise, metrics for the same services would be sent to different Agents, making aggregations inaccurate. -* `"traceID"`: - * Works for logs and spans. - * Signals belonging to the same traceID will be exported to the same backend. -* `"resource"`: - * Works for metrics. - * Signals with the same metric name and the same resource attributes will be exported to the same backend. -* `"metric"`: - * Works for metrics. - * Signals with the same metric name will be exported to the same backend. +* `"service"`: spans with the same `service.name` will be exported to the same backend. +This is useful when using processors like the span metrics, so all spans for each service are sent to consistent Agent instances +for metric collection. Otherwise, metrics for the same services would be sent to different Agents, making aggregations inaccurate. +* `"traceID"`: spans belonging to the same traceID will be exported to the same backend. ## Blocks From 478ff390d998413e61995c548e190690a6fb2b3f Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Tue, 24 Oct 2023 19:49:45 +0100 Subject: [PATCH 7/7] Add tests for otelcol.receiver.kafka --- .../otelcol/receiver/kafka/kafka_test.go | 375 ++++++++++++++++++ docs/developer/updating-otel.md | 1 + 2 files changed, 376 insertions(+) create mode 100644 component/otelcol/receiver/kafka/kafka_test.go diff --git a/component/otelcol/receiver/kafka/kafka_test.go b/component/otelcol/receiver/kafka/kafka_test.go new file mode 100644 index 000000000000..4ad2f6acf247 --- /dev/null +++ b/component/otelcol/receiver/kafka/kafka_test.go @@ -0,0 +1,375 @@ +package kafka_test + +import ( + "testing" + "time" + + "github.com/grafana/agent/component/otelcol/receiver/kafka" + "github.com/grafana/river" + "github.com/mitchellh/mapstructure" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" + "github.com/stretchr/testify/require" +) + +func TestArguments_UnmarshalRiver(t *testing.T) { + tests := []struct { + testName string + cfg string + expected kafkareceiver.Config + }{ + { + testName: "Defaults", + cfg: ` + brokers = ["10.10.10.10:9092"] + protocol_version = "2.0.0" + output {} + `, + expected: kafkareceiver.Config{ + Brokers: []string{"10.10.10.10:9092"}, + ProtocolVersion: "2.0.0", + Topic: "otlp_spans", + Encoding: "otlp_proto", + GroupID: "otel-collector", + ClientID: "otel-collector", + InitialOffset: "latest", + Metadata: kafkaexporter.Metadata{ + Full: true, + Retry: kafkaexporter.MetadataRetry{ + Max: 3, + Backoff: 250 * time.Millisecond, + }, + }, + AutoCommit: kafkareceiver.AutoCommit{ + Enable: true, + Interval: 1 * time.Second, + }, + HeaderExtraction: kafkareceiver.HeaderExtraction{ + ExtractHeaders: false, + Headers: []string{}, + }, + }, + }, + { + testName: "ExplicitValues_AuthPlaintext", + cfg: ` + brokers = ["10.10.10.10:9092"] + protocol_version = "2.0.0" + topic = "test_topic" + encoding = "test_encoding" + group_id = "test_group_id" + client_id = "test_client_id" + initial_offset = "test_offset" + metadata { + include_all_topics = true + retry { + max_retries = 9 + backoff = "11s" + } + } + autocommit { + enable = true + interval = "12s" + } + message_marking { + after_execution = true + include_unsuccessful = true + } + header_extraction { + extract_headers = true + headers = ["foo", "bar"] + } + output {} + `, + expected: kafkareceiver.Config{ + Brokers: []string{"10.10.10.10:9092"}, + ProtocolVersion: "2.0.0", + Topic: "test_topic", + Encoding: "test_encoding", + GroupID: "test_group_id", + ClientID: "test_client_id", + InitialOffset: "test_offset", + Metadata: kafkaexporter.Metadata{ + Full: true, + Retry: kafkaexporter.MetadataRetry{ + Max: 9, + Backoff: 11 * time.Second, + }, + }, + AutoCommit: kafkareceiver.AutoCommit{ + Enable: true, + Interval: 12 * time.Second, + }, + MessageMarking: kafkareceiver.MessageMarking{ + After: true, + OnError: true, + }, + HeaderExtraction: kafkareceiver.HeaderExtraction{ + ExtractHeaders: true, + Headers: []string{"foo", "bar"}, + }, + }, + }, + } + + for _, tc := range tests { + t.Run(tc.testName, func(t *testing.T) { + var args kafka.Arguments + err := river.Unmarshal([]byte(tc.cfg), &args) + require.NoError(t, err) + + actualPtr, err := args.Convert() + require.NoError(t, err) + + actual := actualPtr.(*kafkareceiver.Config) + + require.Equal(t, tc.expected, *actual) + }) + } +} + +func TestArguments_Auth(t *testing.T) { + tests := []struct { + testName string + cfg string + expected map[string]interface{} + }{ + { + testName: "plain_text", + cfg: ` + brokers = ["10.10.10.10:9092"] + protocol_version = "2.0.0" + + authentication { + plaintext { + username = "test_username" + password = "test_password" + } + } + + output {} + `, + expected: map[string]interface{}{ + "brokers": []string{"10.10.10.10:9092"}, + "protocol_version": "2.0.0", + "topic": "otlp_spans", + "encoding": "otlp_proto", + "group_id": "otel-collector", + "client_id": "otel-collector", + "initial_offset": "latest", + "metadata": kafkaexporter.Metadata{ + Full: true, + Retry: kafkaexporter.MetadataRetry{ + Max: 3, + Backoff: 250 * time.Millisecond, + }, + }, + "autocommit": kafkareceiver.AutoCommit{ + Enable: true, + Interval: 1 * time.Second, + }, + "header_extraction": kafkareceiver.HeaderExtraction{ + ExtractHeaders: false, + Headers: []string{}, + }, + "auth": map[string]interface{}{ + "plain_text": map[string]interface{}{ + "username": "test_username", + "password": "test_password", + }, + }, + }, + }, + { + testName: "sasl", + cfg: ` + brokers = ["10.10.10.10:9092"] + protocol_version = "2.0.0" + + authentication { + sasl { + username = "test_username" + password = "test_password" + mechanism = "test_mechanism" + version = 9 + aws_msk { + region = "test_region" + broker_addr = "test_broker_addr" + } + } + } + + output {} + `, + expected: map[string]interface{}{ + "brokers": []string{"10.10.10.10:9092"}, + "protocol_version": "2.0.0", + "topic": "otlp_spans", + "encoding": "otlp_proto", + "group_id": "otel-collector", + "client_id": "otel-collector", + "initial_offset": "latest", + "metadata": kafkaexporter.Metadata{ + Full: true, + Retry: kafkaexporter.MetadataRetry{ + Max: 3, + Backoff: 250 * time.Millisecond, + }, + }, + "autocommit": kafkareceiver.AutoCommit{ + Enable: true, + Interval: 1 * time.Second, + }, + "header_extraction": kafkareceiver.HeaderExtraction{ + ExtractHeaders: false, + Headers: []string{}, + }, + "auth": map[string]interface{}{ + "sasl": map[string]interface{}{ + "username": "test_username", + "password": "test_password", + "mechanism": "test_mechanism", + "version": 9, + "aws_msk": map[string]interface{}{ + "region": "test_region", + "broker_addr": "test_broker_addr", + }, + }, + }, + }, + }, + { + testName: "tls", + cfg: ` + brokers = ["10.10.10.10:9092"] + protocol_version = "2.0.0" + + authentication { + tls { + insecure = true + insecure_skip_verify = true + server_name = "test_server_name_override" + ca_pem = "test_ca_pem" + cert_pem = "test_cert_pem" + key_pem = "test_key_pem" + min_version = "1.1" + reload_interval = "11s" + } + } + + output {} + `, + expected: map[string]interface{}{ + "brokers": []string{"10.10.10.10:9092"}, + "protocol_version": "2.0.0", + "topic": "otlp_spans", + "encoding": "otlp_proto", + "group_id": "otel-collector", + "client_id": "otel-collector", + "initial_offset": "latest", + "metadata": kafkaexporter.Metadata{ + Full: true, + Retry: kafkaexporter.MetadataRetry{ + Max: 3, + Backoff: 250 * time.Millisecond, + }, + }, + "autocommit": kafkareceiver.AutoCommit{ + Enable: true, + Interval: 1 * time.Second, + }, + "header_extraction": kafkareceiver.HeaderExtraction{ + ExtractHeaders: false, + Headers: []string{}, + }, + "auth": map[string]interface{}{ + "tls": map[string]interface{}{ + "insecure": true, + "insecure_skip_verify": true, + "server_name_override": "test_server_name_override", + "ca_pem": "test_ca_pem", + "cert_pem": "test_cert_pem", + "key_pem": "test_key_pem", + "min_version": "1.1", + "reload_interval": 11 * time.Second, + }, + }, + }, + }, + { + testName: "kerberos", + cfg: ` + brokers = ["10.10.10.10:9092"] + protocol_version = "2.0.0" + + authentication { + kerberos { + service_name = "test_service_name" + realm = "test_realm" + use_keytab = true + username = "test_username" + password = "test_password" + config_file = "test_config_filem" + keytab_file = "test_keytab_file" + } + } + + output {} + `, + expected: map[string]interface{}{ + "brokers": []string{"10.10.10.10:9092"}, + "protocol_version": "2.0.0", + "topic": "otlp_spans", + "encoding": "otlp_proto", + "group_id": "otel-collector", + "client_id": "otel-collector", + "initial_offset": "latest", + "metadata": kafkaexporter.Metadata{ + Full: true, + Retry: kafkaexporter.MetadataRetry{ + Max: 3, + Backoff: 250 * time.Millisecond, + }, + }, + "autocommit": kafkareceiver.AutoCommit{ + Enable: true, + Interval: 1 * time.Second, + }, + "header_extraction": kafkareceiver.HeaderExtraction{ + ExtractHeaders: false, + Headers: []string{}, + }, + "auth": map[string]interface{}{ + "kerberos": map[string]interface{}{ + "service_name": "test_service_name", + "realm": "test_realm", + "use_keytab": true, + "username": "test_username", + "password": "test_password", + "config_file": "test_config_filem", + "keytab_file": "test_keytab_file", + }, + }, + }, + }, + } + + for _, tc := range tests { + t.Run(tc.testName, func(t *testing.T) { + var args kafka.Arguments + err := river.Unmarshal([]byte(tc.cfg), &args) + require.NoError(t, err) + + actualPtr, err := args.Convert() + require.NoError(t, err) + + actual := actualPtr.(*kafkareceiver.Config) + + var expected kafkareceiver.Config + err = mapstructure.Decode(tc.expected, &expected) + require.NoError(t, err) + + require.Equal(t, expected, *actual) + }) + } +} diff --git a/docs/developer/updating-otel.md b/docs/developer/updating-otel.md index 6770f3c30328..e0ea00f563ed 100644 --- a/docs/developer/updating-otel.md +++ b/docs/developer/updating-otel.md @@ -84,6 +84,7 @@ Unfortunately, updating Otel dependencies is not straightforward: * Search the Agent repository for the old version (e.g. "0.87") to find code and documentation which also needs updating. * Update the `OTEL_VERSION` parameter in the `docs/sources/_index.md.t` file. + Then run `make generate-versioned-files`, which will update `docs/sources/_index.md`. 5. Some Agent components reuse OpenTelemetry code, but do not import it: * `otelcol.extension.jaeger_remote_sampling`: a lot of this code has been copy-pasted from Otel and modified slightly to fit the Agent's needs.