From 179d4be1abe5795a271c78582391e61811571f85 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 22 May 2023 17:56:28 -0700 Subject: [PATCH 01/21] Fix return error for batch processor when consuming Metrics and Logs (#7711) Signed-off-by: Bogdan Drutu --- .chloggen/fixbatcherror.yaml | 11 +++++++++++ processor/batchprocessor/batch_processor.go | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100755 .chloggen/fixbatcherror.yaml diff --git a/.chloggen/fixbatcherror.yaml b/.chloggen/fixbatcherror.yaml new file mode 100755 index 00000000000..a89e7fbba88 --- /dev/null +++ b/.chloggen/fixbatcherror.yaml @@ -0,0 +1,11 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: batchprocessor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix return error for batch processor when consuming Metrics and Logs + +# One or more tracking issues or pull requests related to the change +issues: [7711] diff --git a/processor/batchprocessor/batch_processor.go b/processor/batchprocessor/batch_processor.go index 3274b130b39..170240e5bc1 100644 --- a/processor/batchprocessor/batch_processor.go +++ b/processor/batchprocessor/batch_processor.go @@ -343,7 +343,7 @@ func (bp *batchProcessor) ConsumeTraces(ctx context.Context, td ptrace.Traces) e func (bp *batchProcessor) ConsumeMetrics(ctx context.Context, md pmetric.Metrics) error { b, err := bp.findBatcher(ctx) if err != nil { - return nil + return err } b.newItem <- md return nil @@ -353,7 +353,7 @@ func (bp *batchProcessor) ConsumeMetrics(ctx context.Context, md pmetric.Metrics func (bp *batchProcessor) ConsumeLogs(ctx context.Context, ld plog.Logs) error { b, err := bp.findBatcher(ctx) if err != nil { - return nil + return err } b.newItem <- ld return nil From e79db959c31a7356a676bccd596f2f66068807bf Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 22 May 2023 18:44:31 -0700 Subject: [PATCH 02/21] [chore] Prepare release v0.78.2 (#7712) * Changelog update v0.78.2 * prepare release 0.78.2 * Prepare beta for version v0.78.2 * add multimod changes 0.78.2 --- .chloggen/fixbatcherror.yaml | 11 -------- CHANGELOG.md | 6 +++++ cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 22 ++++++++-------- cmd/builder/test/core.builder.yaml | 8 +++--- cmd/otelcorecol/builder-config.yaml | 22 ++++++++-------- cmd/otelcorecol/go.mod | 32 ++++++++++++------------ cmd/otelcorecol/main.go | 2 +- component/go.mod | 4 +-- connector/forwardconnector/go.mod | 8 +++--- consumer/go.mod | 2 +- examples/k8s/otel-config.yaml | 4 +-- exporter/go.mod | 10 ++++---- exporter/loggingexporter/go.mod | 12 ++++----- exporter/otlpexporter/go.mod | 12 ++++----- exporter/otlphttpexporter/go.mod | 14 +++++------ extension/ballastextension/go.mod | 6 ++--- extension/zpagesextension/go.mod | 6 ++--- go.mod | 14 +++++------ processor/batchprocessor/go.mod | 12 ++++----- processor/memorylimiterprocessor/go.mod | 12 ++++----- receiver/go.mod | 10 ++++---- receiver/otlpreceiver/go.mod | 14 +++++------ versions.yaml | 2 +- 24 files changed, 121 insertions(+), 126 deletions(-) delete mode 100755 .chloggen/fixbatcherror.yaml diff --git a/.chloggen/fixbatcherror.yaml b/.chloggen/fixbatcherror.yaml deleted file mode 100755 index a89e7fbba88..00000000000 --- a/.chloggen/fixbatcherror.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: batchprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix return error for batch processor when consuming Metrics and Logs - -# One or more tracking issues or pull requests related to the change -issues: [7711] diff --git a/CHANGELOG.md b/CHANGELOG.md index 43d43ad775e..a12e2a1de70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ +## v0.78.2 + +### 🧰 Bug fixes 🧰 + +- `batchprocessor`: Fix return error for batch processor when consuming Metrics and Logs (#7711) + ## v0.78.1 ### 🧰 Bug fixes 🧰 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 316f8c86061..b1dafd389ba 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -15,7 +15,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.78.1" +const defaultOtelColVersion = "0.78.2" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index a9b0847a865..4c7811e45f0 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,21 +2,21 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.78.1-dev - otelcol_version: 0.78.1 + version: 0.78.2-dev + otelcol_version: 0.78.2 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.1 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.2 exporters: - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.78.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.78.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.78.1 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.78.2 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.78.2 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.78.2 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.78.1 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.78.1 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.78.2 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.78.2 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.78.1 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.1 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.78.2 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.2 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.78.1 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.78.2 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index f0d573fdc98..f70a1b9c146 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.78.1 + otelcol_version: 0.78.2 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.78.1 + gomod: go.opentelemetry.io/collector v0.78.2 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.78.1 + gomod: go.opentelemetry.io/collector v0.78.2 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.78.1 + gomod: go.opentelemetry.io/collector v0.78.2 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index a1d77479a41..f98dbea695c 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,23 +2,23 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.78.1-dev - otelcol_version: 0.78.1 + version: 0.78.2-dev + otelcol_version: 0.78.2 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.1 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.2 exporters: - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.78.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.78.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.78.1 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.78.2 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.78.2 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.78.2 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.78.1 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.78.1 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.78.2 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.78.2 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.78.1 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.1 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.78.2 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.2 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.78.1 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.78.2 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 4e97c692f3a..009b1908a91 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,19 +6,19 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/connector/forwardconnector v0.78.1 - go.opentelemetry.io/collector/exporter v0.78.1 - go.opentelemetry.io/collector/exporter/loggingexporter v0.78.1 - go.opentelemetry.io/collector/exporter/otlpexporter v0.78.1 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.78.1 - go.opentelemetry.io/collector/extension/ballastextension v0.78.1 - go.opentelemetry.io/collector/extension/zpagesextension v0.78.1 - go.opentelemetry.io/collector/processor/batchprocessor v0.78.1 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.1 - go.opentelemetry.io/collector/receiver v0.78.1 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/connector/forwardconnector v0.78.2 + go.opentelemetry.io/collector/exporter v0.78.2 + go.opentelemetry.io/collector/exporter/loggingexporter v0.78.2 + go.opentelemetry.io/collector/exporter/otlpexporter v0.78.2 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.78.2 + go.opentelemetry.io/collector/extension/ballastextension v0.78.2 + go.opentelemetry.io/collector/extension/zpagesextension v0.78.2 + go.opentelemetry.io/collector/processor/batchprocessor v0.78.2 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.2 + go.opentelemetry.io/collector/receiver v0.78.2 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.2 golang.org/x/sys v0.8.0 ) @@ -68,11 +68,11 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.78.1 // indirect - go.opentelemetry.io/collector/consumer v0.78.1 // indirect + go.opentelemetry.io/collector/confmap v0.78.2 // indirect + go.opentelemetry.io/collector/consumer v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/semconv v0.78.1 // indirect + go.opentelemetry.io/collector/semconv v0.78.2 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.16.1 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index ee3e46916c2..80721ce7cd3 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -19,7 +19,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.78.1-dev", + Version: "0.78.2-dev", } if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil { diff --git a/component/go.mod b/component/go.mod index 581839e5348..ddb83ff555b 100644 --- a/component/go.mod +++ b/component/go.mod @@ -4,8 +4,8 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel/metric v0.38.1 go.opentelemetry.io/otel/trace v1.15.1 diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 8b4300ca087..96ee8f9bf64 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 ) @@ -22,7 +22,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.78.1 // indirect + go.opentelemetry.io/collector/confmap v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel v1.15.1 // indirect go.opentelemetry.io/otel/metric v0.38.1 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index 6e29b8cc502..ada9b745f12 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 + go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 ) diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index 11211ebaf52..de66944e2bc 100644 --- a/examples/k8s/otel-config.yaml +++ b/examples/k8s/otel-config.yaml @@ -68,7 +68,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-agent-config.yaml" - image: otel/opentelemetry-collector:0.78.1 + image: otel/opentelemetry-collector:0.78.2 name: otel-agent resources: limits: @@ -187,7 +187,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.78.1 + image: otel/opentelemetry-collector:0.78.2 name: otel-collector resources: limits: diff --git a/exporter/go.mod b/exporter/go.mod index 4b003b6d6fe..80f9475ef80 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,9 +6,9 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.8.2 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel v1.15.1 go.opentelemetry.io/otel/sdk v1.15.1 @@ -42,9 +42,9 @@ require ( github.com/prometheus/common v0.43.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.78.1 // indirect + go.opentelemetry.io/collector/confmap v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.1 // indirect + go.opentelemetry.io/collector/receiver v0.78.2 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect go.opentelemetry.io/otel/metric v0.38.1 // indirect go.opentelemetry.io/otel/sdk/metric v0.38.1 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 509eaae22b5..6edc24d2fb7 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -4,11 +4,11 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 - go.opentelemetry.io/collector/exporter v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector/exporter v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.uber.org/zap v1.24.0 golang.org/x/sys v0.8.0 @@ -30,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.1 // indirect + go.opentelemetry.io/collector/receiver v0.78.2 // indirect go.opentelemetry.io/otel v1.15.1 // indirect go.opentelemetry.io/otel/metric v0.38.1 // indirect go.opentelemetry.io/otel/trace v1.15.1 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 8da13790971..b09d38cdc1b 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,11 +4,11 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 - go.opentelemetry.io/collector/exporter v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector/exporter v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 google.golang.org/grpc v1.55.0 @@ -36,7 +36,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.1 // indirect + go.opentelemetry.io/collector/receiver v0.78.2 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect go.opentelemetry.io/otel v1.15.1 // indirect go.opentelemetry.io/otel/metric v0.38.1 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 8edff51a74a..c4fc4687f10 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,14 +4,14 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 - go.opentelemetry.io/collector/exporter v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector/exporter v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/collector/receiver v0.78.1 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.1 + go.opentelemetry.io/collector/receiver v0.78.2 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.2 go.uber.org/zap v1.24.0 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 google.golang.org/grpc v1.55.0 diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 0fac8cfee24..b333bb9ea9c 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 go.uber.org/zap v1.24.0 ) diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index c4ed554aca3..5cc0584cadd 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 go.opentelemetry.io/contrib/zpages v0.41.1 go.opentelemetry.io/otel/sdk v1.15.1 go.opentelemetry.io/otel/trace v1.15.1 diff --git a/go.mod b/go.mod index d50a05df4f1..5034a17ff6c 100644 --- a/go.mod +++ b/go.mod @@ -17,15 +17,15 @@ require ( github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.2 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 - go.opentelemetry.io/collector/exporter v0.78.1 - go.opentelemetry.io/collector/extension/zpagesextension v0.78.1 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector/exporter v0.78.2 + go.opentelemetry.io/collector/extension/zpagesextension v0.78.2 go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/collector/receiver v0.78.1 - go.opentelemetry.io/collector/semconv v0.78.1 + go.opentelemetry.io/collector/receiver v0.78.2 + go.opentelemetry.io/collector/semconv v0.78.2 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 go.opentelemetry.io/contrib/propagators/b3 v1.16.1 diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 2fbda144e2c..ebd5ebaa17f 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -9,10 +9,10 @@ require ( github.com/prometheus/common v0.43.0 github.com/stretchr/testify v1.8.2 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel v1.15.1 go.opentelemetry.io/otel/exporters/prometheus v0.38.1 @@ -44,9 +44,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/exporter v0.78.1 // indirect + go.opentelemetry.io/collector/exporter v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.1 // indirect + go.opentelemetry.io/collector/receiver v0.78.2 // indirect go.opentelemetry.io/otel/trace v1.15.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 5cf3aced722..2b8ad54a002 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,10 +4,10 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.uber.org/zap v1.24.0 ) @@ -32,9 +32,9 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/exporter v0.78.1 // indirect + go.opentelemetry.io/collector/exporter v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.1 // indirect + go.opentelemetry.io/collector/receiver v0.78.2 // indirect go.opentelemetry.io/otel v1.15.1 // indirect go.opentelemetry.io/otel/metric v0.38.1 // indirect go.opentelemetry.io/otel/trace v1.15.1 // indirect diff --git a/receiver/go.mod b/receiver/go.mod index 1975382c80c..f6bcc1c4ca6 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel v1.15.1 go.opentelemetry.io/otel/sdk v1.15.1 @@ -41,8 +41,8 @@ require ( github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.78.1 // indirect - go.opentelemetry.io/collector/exporter v0.78.1 // indirect + go.opentelemetry.io/collector/confmap v0.78.2 // indirect + go.opentelemetry.io/collector/exporter v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect go.opentelemetry.io/otel/metric v0.38.1 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 01db42b4692..2551f5f83da 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -5,13 +5,13 @@ go 1.19 require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.8.2 - go.opentelemetry.io/collector v0.78.1 - go.opentelemetry.io/collector/component v0.78.1 - go.opentelemetry.io/collector/confmap v0.78.1 - go.opentelemetry.io/collector/consumer v0.78.1 + go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector/component v0.78.2 + go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/collector/receiver v0.78.1 - go.opentelemetry.io/collector/semconv v0.78.1 + go.opentelemetry.io/collector/receiver v0.78.2 + go.opentelemetry.io/collector/semconv v0.78.2 go.uber.org/zap v1.24.0 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 google.golang.org/grpc v1.55.0 @@ -50,7 +50,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/exporter v0.78.1 // indirect + go.opentelemetry.io/collector/exporter v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 // indirect diff --git a/versions.yaml b/versions.yaml index bb04b513203..2d1626143fb 100644 --- a/versions.yaml +++ b/versions.yaml @@ -8,7 +8,7 @@ module-sets: - go.opentelemetry.io/collector/featuregate - go.opentelemetry.io/collector/pdata beta: - version: v0.78.1 + version: v0.78.2 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/component From e5a13303424745da9989ae66229d01270242c41b Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 23 May 2023 08:44:09 -0700 Subject: [PATCH 03/21] Change multiBatcher to use sync.Map, avoid global lock on fast path (#7714) Signed-off-by: Bogdan Drutu --- .chloggen/sharder.yaml | 11 ++ processor/batchprocessor/batch_processor.go | 144 +++++++++----------- 2 files changed, 78 insertions(+), 77 deletions(-) create mode 100755 .chloggen/sharder.yaml diff --git a/.chloggen/sharder.yaml b/.chloggen/sharder.yaml new file mode 100755 index 00000000000..a20fa89d4c4 --- /dev/null +++ b/.chloggen/sharder.yaml @@ -0,0 +1,11 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: batchprocessor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Change multiBatcher to use sync.Map, avoid global lock on fast path + +# One or more tracking issues or pull requests related to the change +issues: [7714] diff --git a/processor/batchprocessor/batch_processor.go b/processor/batchprocessor/batch_processor.go index 170240e5bc1..cb258867fb4 100644 --- a/processor/batchprocessor/batch_processor.go +++ b/processor/batchprocessor/batch_processor.go @@ -61,42 +61,28 @@ type batchProcessor struct { telemetry *batchProcessorTelemetry - // batcherFinder will be either *singletonBatcher or *multiBatcher - batcherFinder + // batcher will be either *singletonBatcher or *multiBatcher + batcher batcher } -type batcherFinder interface { - findBatcher(ctx context.Context) (*batcher, error) +type batcher interface { + consume(ctx context.Context, data any) error currentMetadataCardinality() int } -// singleBatcher is used when metadataKeys is empty, to avoid the -// additional lock and map operations used in multiBatcher. -type singleBatcher struct { - *batcher -} - -// multiBatcher is used when metadataKeys is not empty. -type multiBatcher struct { - *batchProcessor - - lock sync.Mutex - batchers map[attribute.Set]*batcher -} - -// batcher is a single instance of the batcher logic. When metadata +// shard is a single instance of the batch logic. When metadata // keys are in use, one of these is created per distinct combination // of values. -type batcher struct { +type shard struct { // processor refers to this processor, for access to common // configuration. processor *batchProcessor // exportCtx is a context with the metadata key-values - // corresponding with this batcher set. + // corresponding with this shard set. exportCtx context.Context - // timer informs the batcher send a batch. + // timer informs the shard send a batch. timer *time.Timer // newItem is used to receive data items from producers. @@ -143,15 +129,14 @@ func newBatchProcessor(set processor.CreateSettings, cfg *Config, batchFunc func metadataLimit: int(cfg.MetadataCardinalityLimit), } if len(bp.metadataKeys) == 0 { - bp.batcherFinder = &singleBatcher{bp.newBatcher(nil)} + bp.batcher = &singleShardBatcher{batcher: bp.newShard(nil)} } else { - bp.batcherFinder = &multiBatcher{ + bp.batcher = &multiShardBatcher{ batchProcessor: bp, - batchers: map[attribute.Set]*batcher{}, } } - bpt, err := newBatchProcessorTelemetry(set, bp.currentMetadataCardinality, useOtel) + bpt, err := newBatchProcessorTelemetry(set, bp.batcher.currentMetadataCardinality, useOtel) if err != nil { return nil, fmt.Errorf("error creating batch processor telemetry: %w", err) } @@ -160,12 +145,12 @@ func newBatchProcessor(set processor.CreateSettings, cfg *Config, batchFunc func return bp, nil } -// newBatcher gets or creates a batcher corresponding with attrs. -func (bp *batchProcessor) newBatcher(md map[string][]string) *batcher { +// newShard gets or creates a batcher corresponding with attrs. +func (bp *batchProcessor) newShard(md map[string][]string) *shard { exportCtx := client.NewContext(context.Background(), client.Info{ Metadata: client.NewMetadata(md), }) - b := &batcher{ + b := &shard{ processor: bp, newItem: make(chan any, runtime.NumCPU()), exportCtx: exportCtx, @@ -194,7 +179,7 @@ func (bp *batchProcessor) Shutdown(context.Context) error { return nil } -func (b *batcher) start() { +func (b *shard) start() { defer b.processor.goroutines.Done() // timerCh ensures we only block when there is a @@ -237,7 +222,7 @@ func (b *batcher) start() { } } -func (b *batcher) processItem(item any) { +func (b *shard) processItem(item any) { b.batch.add(item) sent := false for b.batch.itemCount() > 0 && (!b.hasTimer() || b.batch.itemCount() >= b.processor.sendBatchSize) { @@ -251,23 +236,23 @@ func (b *batcher) processItem(item any) { } } -func (b *batcher) hasTimer() bool { +func (b *shard) hasTimer() bool { return b.timer != nil } -func (b *batcher) stopTimer() { +func (b *shard) stopTimer() { if b.hasTimer() && !b.timer.Stop() { <-b.timer.C } } -func (b *batcher) resetTimer() { +func (b *shard) resetTimer() { if b.hasTimer() { b.timer.Reset(b.processor.timeout) } } -func (b *batcher) sendItems(trigger trigger) { +func (b *shard) sendItems(trigger trigger) { sent, bytes, err := b.batch.export(b.exportCtx, b.processor.sendBatchMaxSize, b.processor.telemetry.detailed) if err != nil { b.processor.logger.Warn("Sender failed", zap.Error(err)) @@ -276,11 +261,33 @@ func (b *batcher) sendItems(trigger trigger) { } } -func (sb *singleBatcher) findBatcher(_ context.Context) (*batcher, error) { - return sb.batcher, nil +// singleShardBatcher is used when metadataKeys is empty, to avoid the +// additional lock and map operations used in multiBatcher. +type singleShardBatcher struct { + batcher *shard +} + +func (sb *singleShardBatcher) consume(_ context.Context, data any) error { + sb.batcher.newItem <- data + return nil +} + +func (sb *singleShardBatcher) currentMetadataCardinality() int { + return 1 +} + +// multiBatcher is used when metadataKeys is not empty. +type multiShardBatcher struct { + *batchProcessor + batchers sync.Map + + // Guards the size and the storing logic to ensure no more than limit items are stored. + // If we are willing to allow "some" extra items than the limit this can be removed and size can be made atomic. + lock sync.Mutex + size int } -func (mb *multiBatcher) findBatcher(ctx context.Context) (*batcher, error) { +func (mb *multiShardBatcher) consume(ctx context.Context, data any) error { // Get each metadata key value, form the corresponding // attribute set for use as a map lookup key. info := client.FromContext(ctx) @@ -300,63 +307,46 @@ func (mb *multiBatcher) findBatcher(ctx context.Context) (*batcher, error) { } aset := attribute.NewSet(attrs...) - mb.lock.Lock() - defer mb.lock.Unlock() - - b, ok := mb.batchers[aset] - if ok { - return b, nil - } + b, ok := mb.batchers.Load(aset) + if !ok { + mb.lock.Lock() + if mb.metadataLimit != 0 && mb.size >= mb.metadataLimit { + mb.lock.Unlock() + return errTooManyBatchers + } - if limit := mb.metadataLimit; limit != 0 && len(mb.batchers) >= limit { - return nil, errTooManyBatchers + // aset.ToSlice() returns the sorted, deduplicated, + // and name-downcased list of attributes. + var loaded bool + b, loaded = mb.batchers.LoadOrStore(aset, mb.newShard(md)) + if !loaded { + mb.size++ + } + mb.lock.Unlock() } - - // aset.ToSlice() returns the sorted, deduplicated, - // and name-downcased list of attributes. - b = mb.newBatcher(md) - mb.batchers[aset] = b - return b, nil -} - -func (sb *singleBatcher) currentMetadataCardinality() int { - return 1 + b.(*shard).newItem <- data + return nil } -func (mb *multiBatcher) currentMetadataCardinality() int { +func (mb *multiShardBatcher) currentMetadataCardinality() int { mb.lock.Lock() defer mb.lock.Unlock() - return len(mb.batchers) + return mb.size } // ConsumeTraces implements TracesProcessor func (bp *batchProcessor) ConsumeTraces(ctx context.Context, td ptrace.Traces) error { - b, err := bp.findBatcher(ctx) - if err != nil { - return err - } - b.newItem <- td - return nil + return bp.batcher.consume(ctx, td) } // ConsumeMetrics implements MetricsProcessor func (bp *batchProcessor) ConsumeMetrics(ctx context.Context, md pmetric.Metrics) error { - b, err := bp.findBatcher(ctx) - if err != nil { - return err - } - b.newItem <- md - return nil + return bp.batcher.consume(ctx, md) } // ConsumeLogs implements LogsProcessor func (bp *batchProcessor) ConsumeLogs(ctx context.Context, ld plog.Logs) error { - b, err := bp.findBatcher(ctx) - if err != nil { - return err - } - b.newItem <- ld - return nil + return bp.batcher.consume(ctx, ld) } // newBatchTracesProcessor creates a new batch processor that batches traces by size or with timeout From 2dc16f31b63a3f402368bac275b43caf529ae46a Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 23 May 2023 12:27:44 -0700 Subject: [PATCH 04/21] [chore] configure renovate (#7724) This will allow the repo to move away from dependabot in the near future. Adding a tidy github action, which will run gotidy on PRs opened by renovate to allow maintainer to merge them without further changes required. Linked issue: #4885 --------- Signed-off-by: Alex Boten --- .github/workflows/tidy-dependencies.yml | 49 +++++++++++++++++++++++++ processor/batchprocessor/renovate.json | 31 ++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 .github/workflows/tidy-dependencies.yml create mode 100644 processor/batchprocessor/renovate.json diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml new file mode 100644 index 00000000000..bb82a522fc8 --- /dev/null +++ b/.github/workflows/tidy-dependencies.yml @@ -0,0 +1,49 @@ +name: "Project: Tidy" +on: + pull_request_target: + types: [opened, ready_for_review, synchronize, reopened, labeled, unlabeled] + branches: + - main + +jobs: + setup-environment: + timeout-minutes: 30 + runs-on: ubuntu-latest + if: ${{ contains(github.event.pull_request.labels.*.name, 'dependencies') }} + steps: + - uses: actions/checkout@v3 + with: + # currently the fork of this repo is from a personal fork + # because of an issue when creating multiple forks using forking renovate + # + # see https://github.com/renovatebot/renovate/discussions/21057 + repository: "renovate-bot/codeboten-_-opentelemetry-collector" + ref: ${{ github.head_ref }} + token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + - uses: actions/setup-go@v4 + with: + go-version: 1.19 + cache: false + - name: Cache Go + id: go-cache + uses: actions/cache@v3 + with: + path: | + ~/go/bin + ~/go/pkg/mod + key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }} + - name: Install dependencies + if: steps.go-cache.outputs.cache-hit != 'true' + run: make -j2 gomoddownload + - name: Install Tools + if: steps.go-cache.outputs.cache-hit != 'true' + run: make install-tools + - name: go mod tidy + run: | + make gotidy + git config user.name opentelemetrybot + git config user.email 107717825+opentelemetrybot@users.noreply.github.com + echo "git diff --exit-code || (git add . && git commit -m \"go mod tidy\" && git push)" + git diff --exit-code || (git add . && git commit -m "go mod tidy" && git push) + env: + GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} diff --git a/processor/batchprocessor/renovate.json b/processor/batchprocessor/renovate.json new file mode 100644 index 00000000000..df04fb36693 --- /dev/null +++ b/processor/batchprocessor/renovate.json @@ -0,0 +1,31 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "labels": [ + "dependencies" + ], + "extends": [ + "config:base" + ], + "schedule": ["every tuesday"], + "packageRules": [ + { + "matchManagers": ["dockerfile"], + "groupName": "dockerfile deps" + }, + { + "matchManagers": ["docker-compose"], + "groupName": "docker-compose deps" + }, + { + "matchManagers": ["github-actions"], + "groupName": "github-actions deps" + }, + { + "matchManagers": ["gomod"], + "matchUpdateTypes": ["minor", "major"] + } + ], + "ignoreDeps": [ + "github.com/mattn/go-ieproxy" + ] + } From 6312e62ea4ab0e1ea7d254282e5dd131c4dd9ba1 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 23 May 2023 15:12:47 -0700 Subject: [PATCH 05/21] add benchmark test for multi batch processing (#7717) * add benchmark test for multi batch processing This refactors the batch processor tests to make testing multiple configuration scenarios easier. It adds a testcase for a batch processor w/ metadata keys. Signed-off-by: Alex Boten * use RunParallel Signed-off-by: Alex Boten --------- Signed-off-by: Alex Boten --- .../batchprocessor/batch_processor_test.go | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/processor/batchprocessor/batch_processor_test.go b/processor/batchprocessor/batch_processor_test.go index 8a8f73be6d9..11eaa9b071f 100644 --- a/processor/batchprocessor/batch_processor_test.go +++ b/processor/batchprocessor/batch_processor_test.go @@ -611,6 +611,20 @@ func BenchmarkBatchMetricProcessor(b *testing.B) { Timeout: 100 * time.Millisecond, SendBatchSize: 2000, } + runMetricsProcessorBenchmark(b, cfg) +} + +func BenchmarkMultiBatchMetricProcessor(b *testing.B) { + b.StopTimer() + cfg := Config{ + Timeout: 100 * time.Millisecond, + SendBatchSize: 2000, + MetadataKeys: []string{"test", "test2"}, + } + runMetricsProcessorBenchmark(b, cfg) +} + +func runMetricsProcessorBenchmark(b *testing.B, cfg Config) { ctx := context.Background() sink := new(metricsSink) creationSet := processortest.NewNopCreateSettings() @@ -620,16 +634,12 @@ func BenchmarkBatchMetricProcessor(b *testing.B) { require.NoError(b, err) require.NoError(b, batcher.Start(ctx, componenttest.NewNopHost())) - mds := make([]pmetric.Metrics, 0, b.N) - for n := 0; n < b.N; n++ { - mds = append(mds, - testdata.GenerateMetrics(metricsPerRequest), - ) - } b.StartTimer() - for n := 0; n < b.N; n++ { - require.NoError(b, batcher.ConsumeMetrics(ctx, mds[n])) - } + b.RunParallel(func(pb *testing.PB) { + for pb.Next() { + require.NoError(b, batcher.ConsumeMetrics(ctx, testdata.GenerateMetrics(metricsPerRequest))) + } + }) b.StopTimer() require.NoError(b, batcher.Shutdown(ctx)) require.Equal(b, b.N*metricsPerRequest, sink.metricsCount) From 3593e9630b3f21294f5d06efe79e653fd8c7819e Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Wed, 24 May 2023 08:19:45 -0700 Subject: [PATCH 06/21] [chore] mv renovate config & update fork config (#7766) accidentally placed the file in the wrong directory --------- Signed-off-by: Alex Boten --- .github/workflows/tidy-dependencies.yml | 6 +----- processor/batchprocessor/renovate.json => renovate.json | 0 2 files changed, 1 insertion(+), 5 deletions(-) rename processor/batchprocessor/renovate.json => renovate.json (100%) diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index bb82a522fc8..d708a77352c 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -13,11 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - # currently the fork of this repo is from a personal fork - # because of an issue when creating multiple forks using forking renovate - # - # see https://github.com/renovatebot/renovate/discussions/21057 - repository: "renovate-bot/codeboten-_-opentelemetry-collector" + repository: "renovate-bot/open-telemetry-_-opentelemetry-collector" ref: ${{ github.head_ref }} token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} - uses: actions/setup-go@v4 diff --git a/processor/batchprocessor/renovate.json b/renovate.json similarity index 100% rename from processor/batchprocessor/renovate.json rename to renovate.json From 49b4e46f58b0633b9bcc98d6473882c8ccd39d33 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 24 May 2023 16:19:47 -0700 Subject: [PATCH 07/21] Delete unnecessary file test.js (#7770) --- test.js | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 test.js diff --git a/test.js b/test.js deleted file mode 100644 index 3db8c42f226..00000000000 --- a/test.js +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - const milestones = github.rest.issues.listMilestones({ - owner: context.repo.owner, - repo: context.repo.repo, - state: "open" - }) - console.log(mielstones) - - for (const milestone of milestones) { - console.log(milestone) - if (milestone.title.startsWith("v")) { - console.log("found it") - //await github.issues.update({ - //owner: context.repo.owner, - //repo: context.repo.repo, - //issue_number: ${{ github.event.pull_request.number }}, - //milestone: milestone.number - //}); - //return - } - } \ No newline at end of file From 87dd85a6c03489ec70392629aa26e609bbb473ce Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 25 May 2023 09:51:44 -0700 Subject: [PATCH 08/21] [chore] update otel-go deps (#7772) Signed-off-by: Alex Boten --- cmd/otelcorecol/go.mod | 16 ++++++------- cmd/otelcorecol/go.sum | 31 ++++++++++++------------ component/go.mod | 8 +++---- component/go.sum | 20 +++++++--------- connector/forwardconnector/go.mod | 8 +++---- connector/forwardconnector/go.sum | 20 +++++++--------- consumer/go.mod | 2 +- consumer/go.sum | 9 ++----- exporter/go.mod | 12 +++++----- exporter/go.sum | 24 +++++++++---------- exporter/loggingexporter/go.mod | 8 +++---- exporter/loggingexporter/go.sum | 20 ++++++++-------- exporter/otlpexporter/go.mod | 10 ++++---- exporter/otlpexporter/go.sum | 24 +++++++++---------- exporter/otlphttpexporter/go.mod | 12 +++++----- exporter/otlphttpexporter/go.sum | 28 +++++++++++----------- extension/ballastextension/go.mod | 8 +++---- extension/ballastextension/go.sum | 15 ++++++------ extension/zpagesextension/go.mod | 10 ++++---- extension/zpagesextension/go.sum | 24 ++++++++----------- go.mod | 16 ++++++------- go.sum | 31 ++++++++++++------------ processor/batchprocessor/go.mod | 12 +++++----- processor/batchprocessor/go.sum | 24 +++++++++---------- processor/memorylimiterprocessor/go.mod | 8 +++---- processor/memorylimiterprocessor/go.sum | 19 ++++++++------- receiver/go.mod | 12 +++++----- receiver/go.sum | 24 +++++++++---------- receiver/otlpreceiver/go.mod | 16 ++++++------- receiver/otlpreceiver/go.sum | 32 ++++++++++++------------- 30 files changed, 245 insertions(+), 258 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 009b1908a91..fb82b2fa29d 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -5,7 +5,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/connector/forwardconnector v0.78.2 @@ -73,17 +73,17 @@ require ( go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/semconv v0.78.2 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.16.1 // indirect go.opentelemetry.io/contrib/zpages v0.41.1 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v0.38.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/sdk v1.15.1 // indirect - go.opentelemetry.io/otel/sdk/metric v0.38.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/sdk v1.16.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index f4d08d550b5..e0aa5658d32 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -394,8 +394,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= @@ -419,28 +420,28 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 h1:Ei1FUQ5CbSNkl2o/XAiksXSyQNAeJBX3ivqJpJ254Ak= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1/go.mod h1:f7TOPTlEcliCBlOYPuNnZTuND71MVTAoINWIt1SmP/c= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 h1:pX+lppB8PArapyhS6nBStyQmkaDUPWdQf0UmEGRCQ54= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1/go.mod h1:2FmkXne0k9nkp27LD/m+uoh8dNlstsiCJ7PLc/S72aI= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 h1:ZOLJc06r4CB42laIXg/7udr0pbZyuAihN10A/XuiQRY= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= go.opentelemetry.io/contrib/propagators/b3 v1.16.1 h1:Y9Dk1kR93eSHadRTkqnm+QyQVhHthCcvTkoP/Afh7+4= go.opentelemetry.io/contrib/propagators/b3 v1.16.1/go.mod h1:IR0G6txqoetQrjjdoDGe+udhFegxnQQd0dOJfFS8Jg0= go.opentelemetry.io/contrib/zpages v0.41.1 h1:FReY8OWFNtYm4mWleTRxTUyD3r02uGcwS6ZeElahs00= go.opentelemetry.io/contrib/zpages v0.41.1/go.mod h1:C3iy146ccMyv1+gEaxVDDHuoT7yXAKKmbg+twudDpeg= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/bridge/opencensus v0.38.1 h1:LQgPKIZXkaQgesDm39WG1+ikhh1BhKF0NZ2HpPsVrKM= go.opentelemetry.io/otel/bridge/opencensus v0.38.1/go.mod h1:LCRCnb4WESU7/1qj/FcVPuRa9S8C+Cetk863qoMn0wA= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/sdk/metric v0.38.1/go.mod h1:Rn4kSXFF9ZQZ5lL1pxQjCbK4seiO+U7s0ncmIFJaj34= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/component/go.mod b/component/go.mod index ddb83ff555b..5ce5b1ed681 100644 --- a/component/go.mod +++ b/component/go.mod @@ -3,12 +3,12 @@ module go.opentelemetry.io/collector/component go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/otel/metric v0.38.1 - go.opentelemetry.io/otel/trace v1.15.1 + go.opentelemetry.io/otel/metric v1.16.0 + go.opentelemetry.io/otel/trace v1.16.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 ) @@ -23,7 +23,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/sys v0.8.0 // indirect diff --git a/component/go.sum b/component/go.sum index 0788e8dcb75..a062638d6d4 100644 --- a/component/go.sum +++ b/component/go.sum @@ -233,29 +233,25 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 96ee8f9bf64..cb5a039c095 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/connector/forwardconnector go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/consumer v0.78.2 @@ -24,9 +24,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/confmap v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index 4c5fb468594..ac7b74197c4 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -238,29 +238,25 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/consumer/go.mod b/consumer/go.mod index ada9b745f12..b35fd9fe832 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/consumer go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 ) diff --git a/consumer/go.sum b/consumer/go.sum index 7b793afe2df..811e9811fe4 100644 --- a/consumer/go.sum +++ b/consumer/go.sum @@ -26,13 +26,9 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -78,6 +74,5 @@ google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cn google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/exporter/go.mod b/exporter/go.mod index 80f9475ef80..effb1452dc4 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -4,15 +4,15 @@ go 1.19 require ( github.com/cenkalti/backoff/v4 v4.2.1 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/otel v1.15.1 - go.opentelemetry.io/otel/sdk v1.15.1 - go.opentelemetry.io/otel/trace v1.15.1 + go.opentelemetry.io/otel v1.16.0 + go.opentelemetry.io/otel/sdk v1.16.0 + go.opentelemetry.io/otel/trace v1.16.0 go.uber.org/zap v1.24.0 ) @@ -46,8 +46,8 @@ require ( go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/receiver v0.78.2 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/sdk/metric v0.38.1 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.10.0 // indirect diff --git a/exporter/go.sum b/exporter/go.sum index f8e34c4585d..b02f71d436e 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -359,8 +359,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -378,18 +378,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/sdk/metric v0.38.1/go.mod h1:Rn4kSXFF9ZQZ5lL1pxQjCbK4seiO+U7s0ncmIFJaj34= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 6edc24d2fb7..016088d326c 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/exporter/loggingexporter go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 @@ -31,9 +31,9 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/receiver v0.78.2 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.10.0 // indirect diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 0594bcf5c28..ef511bd2006 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -265,8 +265,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -275,15 +275,15 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index b09d38cdc1b..6ad530a58b4 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/exporter/otlpexporter go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 @@ -37,10 +37,10 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/receiver v0.78.2 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 3f7b2844b1e..95923cf0c1b 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -277,8 +277,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -287,17 +287,17 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 h1:Ei1FUQ5CbSNkl2o/XAiksXSyQNAeJBX3ivqJpJ254Ak= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1/go.mod h1:f7TOPTlEcliCBlOYPuNnZTuND71MVTAoINWIt1SmP/c= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 h1:ZOLJc06r4CB42laIXg/7udr0pbZyuAihN10A/XuiQRY= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index c4fc4687f10..885d78f752e 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/exporter/otlphttpexporter go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 @@ -41,11 +41,11 @@ require ( github.com/rs/cors v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.10.0 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index ef2bf4e7581..09f340f09d7 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -281,8 +281,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -291,19 +291,19 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 h1:Ei1FUQ5CbSNkl2o/XAiksXSyQNAeJBX3ivqJpJ254Ak= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1/go.mod h1:f7TOPTlEcliCBlOYPuNnZTuND71MVTAoINWIt1SmP/c= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 h1:pX+lppB8PArapyhS6nBStyQmkaDUPWdQf0UmEGRCQ54= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1/go.mod h1:2FmkXne0k9nkp27LD/m+uoh8dNlstsiCJ7PLc/S72aI= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 h1:ZOLJc06r4CB42laIXg/7udr0pbZyuAihN10A/XuiQRY= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index b333bb9ea9c..4300ee8fb67 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/extension/ballastextension go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 @@ -28,9 +28,9 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.10.0 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index 54cefc37abb..cb178b6e53d 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -253,8 +253,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= @@ -267,12 +268,12 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 5cc0584cadd..79fa220fbc4 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -3,13 +3,13 @@ module go.opentelemetry.io/collector/extension/zpagesextension go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 go.opentelemetry.io/contrib/zpages v0.41.1 - go.opentelemetry.io/otel/sdk v1.15.1 - go.opentelemetry.io/otel/trace v1.15.1 + go.opentelemetry.io/otel/sdk v1.16.0 + go.opentelemetry.io/otel/trace v1.16.0 go.uber.org/zap v1.24.0 ) @@ -26,8 +26,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.10.0 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index 70be1f53331..63a1e08b405 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -236,17 +236,13 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -255,14 +251,14 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opentelemetry.io/contrib/zpages v0.41.1 h1:FReY8OWFNtYm4mWleTRxTUyD3r02uGcwS6ZeElahs00= go.opentelemetry.io/contrib/zpages v0.41.1/go.mod h1:C3iy146ccMyv1+gEaxVDDHuoT7yXAKKmbg+twudDpeg= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/go.mod b/go.mod index 5034a17ff6c..7020c3aad78 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/rs/cors v1.9.0 github.com/shirou/gopsutil/v3 v3.23.4 github.com/spf13/cobra v1.7.0 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opencensus.io v0.24.0 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 @@ -26,16 +26,16 @@ require ( go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/collector/receiver v0.78.2 go.opentelemetry.io/collector/semconv v0.78.2 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 go.opentelemetry.io/contrib/propagators/b3 v1.16.1 - go.opentelemetry.io/otel v1.15.1 + go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/bridge/opencensus v0.38.1 go.opentelemetry.io/otel/exporters/prometheus v0.38.1 - go.opentelemetry.io/otel/metric v0.38.1 - go.opentelemetry.io/otel/sdk v1.15.1 - go.opentelemetry.io/otel/sdk/metric v0.38.1 - go.opentelemetry.io/otel/trace v1.15.1 + go.opentelemetry.io/otel/metric v1.16.0 + go.opentelemetry.io/otel/sdk v1.16.0 + go.opentelemetry.io/otel/sdk/metric v0.39.0 + go.opentelemetry.io/otel/trace v1.16.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 golang.org/x/net v0.10.0 diff --git a/go.sum b/go.sum index c64a9962f17..02be140f8d9 100644 --- a/go.sum +++ b/go.sum @@ -393,8 +393,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= @@ -418,28 +419,28 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 h1:Ei1FUQ5CbSNkl2o/XAiksXSyQNAeJBX3ivqJpJ254Ak= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1/go.mod h1:f7TOPTlEcliCBlOYPuNnZTuND71MVTAoINWIt1SmP/c= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 h1:pX+lppB8PArapyhS6nBStyQmkaDUPWdQf0UmEGRCQ54= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1/go.mod h1:2FmkXne0k9nkp27LD/m+uoh8dNlstsiCJ7PLc/S72aI= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 h1:ZOLJc06r4CB42laIXg/7udr0pbZyuAihN10A/XuiQRY= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= go.opentelemetry.io/contrib/propagators/b3 v1.16.1 h1:Y9Dk1kR93eSHadRTkqnm+QyQVhHthCcvTkoP/Afh7+4= go.opentelemetry.io/contrib/propagators/b3 v1.16.1/go.mod h1:IR0G6txqoetQrjjdoDGe+udhFegxnQQd0dOJfFS8Jg0= go.opentelemetry.io/contrib/zpages v0.41.1 h1:FReY8OWFNtYm4mWleTRxTUyD3r02uGcwS6ZeElahs00= go.opentelemetry.io/contrib/zpages v0.41.1/go.mod h1:C3iy146ccMyv1+gEaxVDDHuoT7yXAKKmbg+twudDpeg= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/bridge/opencensus v0.38.1 h1:LQgPKIZXkaQgesDm39WG1+ikhh1BhKF0NZ2HpPsVrKM= go.opentelemetry.io/otel/bridge/opencensus v0.38.1/go.mod h1:LCRCnb4WESU7/1qj/FcVPuRa9S8C+Cetk863qoMn0wA= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/sdk/metric v0.38.1/go.mod h1:Rn4kSXFF9ZQZ5lL1pxQjCbK4seiO+U7s0ncmIFJaj34= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index ebd5ebaa17f..7508684a9da 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -7,18 +7,18 @@ require ( github.com/prometheus/client_golang v1.15.1 github.com/prometheus/client_model v0.4.0 github.com/prometheus/common v0.43.0 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/otel v1.15.1 + go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/exporters/prometheus v0.38.1 - go.opentelemetry.io/otel/metric v0.38.1 - go.opentelemetry.io/otel/sdk v1.15.1 - go.opentelemetry.io/otel/sdk/metric v0.38.1 + go.opentelemetry.io/otel/metric v1.16.0 + go.opentelemetry.io/otel/sdk v1.16.0 + go.opentelemetry.io/otel/sdk/metric v0.39.0 go.uber.org/zap v1.24.0 ) @@ -47,7 +47,7 @@ require ( go.opentelemetry.io/collector/exporter v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/receiver v0.78.2 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.10.0 // indirect diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index 390c29997d6..4f8e35c7aee 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -357,8 +357,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -376,18 +376,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/sdk/metric v0.38.1/go.mod h1:Rn4kSXFF9ZQZ5lL1pxQjCbK4seiO+U7s0ncmIFJaj34= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 2b8ad54a002..09ddb94c112 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/processor/memorylimiterprocessor go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 @@ -35,9 +35,9 @@ require ( go.opentelemetry.io/collector/exporter v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/receiver v0.78.2 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.10.0 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 0e433c5915a..9148ebe36f8 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -273,8 +273,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= @@ -289,15 +290,15 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/receiver/go.mod b/receiver/go.mod index f6bcc1c4ca6..8970261a987 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -3,13 +3,13 @@ module go.opentelemetry.io/collector/receiver go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/otel v1.15.1 - go.opentelemetry.io/otel/sdk v1.15.1 + go.opentelemetry.io/otel v1.16.0 + go.opentelemetry.io/otel/sdk v1.16.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 ) @@ -45,9 +45,9 @@ require ( go.opentelemetry.io/collector/exporter v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/sdk/metric v0.38.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/sys v0.8.0 // indirect diff --git a/receiver/go.sum b/receiver/go.sum index 390c29997d6..4f8e35c7aee 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -357,8 +357,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -376,18 +376,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/sdk/metric v0.38.1/go.mod h1:Rn4kSXFF9ZQZ5lL1pxQjCbK4seiO+U7s0ncmIFJaj34= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 2551f5f83da..35ad6243eef 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/gogo/protobuf v1.3.2 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 @@ -52,14 +52,14 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/exporter v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 // indirect - go.opentelemetry.io/otel v1.15.1 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect - go.opentelemetry.io/otel/metric v0.38.1 // indirect - go.opentelemetry.io/otel/sdk v1.15.1 // indirect - go.opentelemetry.io/otel/sdk/metric v0.38.1 // indirect - go.opentelemetry.io/otel/trace v1.15.1 // indirect + go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/sdk v1.16.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.10.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index c9f2d02055e..9b9e0b0fc5a 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -371,8 +371,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -390,22 +390,22 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 h1:Ei1FUQ5CbSNkl2o/XAiksXSyQNAeJBX3ivqJpJ254Ak= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1/go.mod h1:f7TOPTlEcliCBlOYPuNnZTuND71MVTAoINWIt1SmP/c= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 h1:pX+lppB8PArapyhS6nBStyQmkaDUPWdQf0UmEGRCQ54= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1/go.mod h1:2FmkXne0k9nkp27LD/m+uoh8dNlstsiCJ7PLc/S72aI= -go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8= -go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 h1:ZOLJc06r4CB42laIXg/7udr0pbZyuAihN10A/XuiQRY= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= -go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s= -go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ= -go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI= -go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA= -go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8= -go.opentelemetry.io/otel/sdk/metric v0.38.1/go.mod h1:Rn4kSXFF9ZQZ5lL1pxQjCbK4seiO+U7s0ncmIFJaj34= -go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY= -go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8= +go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= From fe2ae8defc1975ae95c81596f28a9968ff61f97a Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Fri, 26 May 2023 16:34:08 -0600 Subject: [PATCH 09/21] Deprecate component.Host.GetExporters (#7390) Co-authored-by: Dmitrii Anoshin --- .chloggen/deprecate-get-exporters.yaml | 16 ++++++++++++++++ component/componenttest/nop_host_test.go | 2 +- component/host.go | 7 +++++++ service/host.go | 6 ++++++ service/internal/graph/graph.go | 6 ++++++ 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100755 .chloggen/deprecate-get-exporters.yaml diff --git a/.chloggen/deprecate-get-exporters.yaml b/.chloggen/deprecate-get-exporters.yaml new file mode 100755 index 00000000000..b26dedd7e7c --- /dev/null +++ b/.chloggen/deprecate-get-exporters.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: component + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate Host.GetExporters function + +# One or more tracking issues or pull requests related to the change +issues: [7370] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/component/componenttest/nop_host_test.go b/component/componenttest/nop_host_test.go index 4fbdbd4a1c6..1bcb92d1744 100644 --- a/component/componenttest/nop_host_test.go +++ b/component/componenttest/nop_host_test.go @@ -19,7 +19,7 @@ func TestNewNopHost(t *testing.T) { require.IsType(t, &nopHost{}, nh) nh.ReportFatalError(errors.New("TestError")) - assert.Nil(t, nh.GetExporters()) + assert.Nil(t, nh.GetExporters()) // nolint: staticcheck assert.Nil(t, nh.GetExtensions()) assert.Nil(t, nh.GetFactory(component.KindReceiver, "test")) } diff --git a/component/host.go b/component/host.go index c826a82b877..ea3825d743f 100644 --- a/component/host.go +++ b/component/host.go @@ -47,5 +47,12 @@ type Host interface { // // GetExporters can be called by the component anytime after Component.Start() begins and // until Component.Shutdown() ends. + // + // Deprecated: [0.79.0] This function will be removed in the future. + // Several components in the contrib repository use this function so it cannot be removed + // before those cases are removed. In most cases, use of this function can be replaced by a + // connector. See https://github.com/open-telemetry/opentelemetry-collector/issues/7370 and + // https://github.com/open-telemetry/opentelemetry-collector/pull/7390#issuecomment-1483710184 + // for additional information. GetExporters() map[DataType]map[ID]Component } diff --git a/service/host.go b/service/host.go index 79bbbf40046..d216ae94adb 100644 --- a/service/host.go +++ b/service/host.go @@ -57,6 +57,12 @@ func (host *serviceHost) GetExtensions() map[component.ID]component.Component { return host.serviceExtensions.GetExtensions() } +// Deprecated: [0.79.0] This function will be removed in the future. +// Several components in the contrib repository use this function so it cannot be removed +// before those cases are removed. In most cases, use of this function can be replaced by a +// connector. See https://github.com/open-telemetry/opentelemetry-collector/issues/7370 and +// https://github.com/open-telemetry/opentelemetry-collector/pull/7390#issuecomment-1483710184 +// for additional information. func (host *serviceHost) GetExporters() map[component.DataType]map[component.ID]component.Component { return host.pipelines.GetExporters() } diff --git a/service/internal/graph/graph.go b/service/internal/graph/graph.go index ee39954a38f..97fa45af68a 100644 --- a/service/internal/graph/graph.go +++ b/service/internal/graph/graph.go @@ -310,6 +310,12 @@ func (g *Graph) ShutdownAll(ctx context.Context) error { return errs } +// Deprecated: [0.79.0] This function will be removed in the future. +// Several components in the contrib repository use this function so it cannot be removed +// before those cases are removed. In most cases, use of this function can be replaced by a +// connector. See https://github.com/open-telemetry/opentelemetry-collector/issues/7370 and +// https://github.com/open-telemetry/opentelemetry-collector/pull/7390#issuecomment-1483710184 +// for additional information. func (g *Graph) GetExporters() map[component.DataType]map[component.ID]component.Component { exportersMap := make(map[component.DataType]map[component.ID]component.Component) exportersMap[component.DataTypeTraces] = make(map[component.ID]component.Component) From 14c039d701ce0f9ae196bc415bc8d0a5e2946c97 Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Fri, 26 May 2023 17:13:53 -0700 Subject: [PATCH 10/21] dependabot updates Fri May 26 22:24:04 UTC 2023 (#7775) Bump github.com/mikefarah/yq/v4 from 4.33.3 to 4.34.1 in /internal/tools Bump github.com/prometheus/common from 0.43.0 to 0.44.0 Bump github.com/prometheus/common from 0.43.0 to 0.44.0 in /processor/batchprocessor Bump github.com/stretchr/testify from 1.8.2 to 1.8.3 in /cmd/builder Bump github.com/stretchr/testify from 1.8.2 to 1.8.3 in /confmap Bump github.com/stretchr/testify from 1.8.2 to 1.8.3 in /featuregate Bump github.com/stretchr/testify from 1.8.2 to 1.8.3 in /pdata Bump github.com/stretchr/testify from 1.8.2 to 1.8.3 in /semconv Bump go.opentelemetry.io/contrib/propagators/b3 from 1.16.1 to 1.17.0 Bump go.opentelemetry.io/contrib/zpages from 0.41.1 to 0.42.0 in /extension/zpagesextension Bump go.opentelemetry.io/otel/bridge/opencensus from 0.38.1 to 0.39.0 Bump go.opentelemetry.io/otel/exporters/prometheus from 0.38.1 to 0.39.0 in /processor/batchprocessor --- cmd/builder/go.mod | 2 +- cmd/builder/go.sum | 8 ++------ cmd/otelcorecol/go.mod | 10 +++++----- cmd/otelcorecol/go.sum | 22 +++++++++++----------- confmap/go.mod | 2 +- confmap/go.sum | 8 ++------ exporter/go.mod | 4 ++-- exporter/go.sum | 8 ++++---- exporter/loggingexporter/go.sum | 4 ++-- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.sum | 4 ++-- extension/zpagesextension/go.mod | 2 +- extension/zpagesextension/go.sum | 4 ++-- featuregate/go.mod | 2 +- featuregate/go.sum | 11 ++--------- go.mod | 10 +++++----- go.sum | 22 +++++++++++----------- internal/tools/go.mod | 6 +++--- internal/tools/go.sum | 11 ++++++----- pdata/go.mod | 2 +- pdata/go.sum | 9 ++------- processor/batchprocessor/go.mod | 4 ++-- processor/batchprocessor/go.sum | 8 ++++---- processor/memorylimiterprocessor/go.sum | 4 ++-- receiver/go.mod | 4 ++-- receiver/go.sum | 8 ++++---- receiver/otlpreceiver/go.mod | 4 ++-- receiver/otlpreceiver/go.sum | 10 +++++----- semconv/go.mod | 2 +- semconv/go.sum | 11 ++--------- 30 files changed, 92 insertions(+), 118 deletions(-) diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod index d60be15808d..500e4b2f36c 100644 --- a/cmd/builder/go.mod +++ b/cmd/builder/go.mod @@ -9,7 +9,7 @@ require ( github.com/knadh/koanf v1.5.0 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 ) diff --git a/cmd/builder/go.sum b/cmd/builder/go.sum index 5f4920e1571..978d5ef47c3 100644 --- a/cmd/builder/go.sum +++ b/cmd/builder/go.sum @@ -243,17 +243,13 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index fb82b2fa29d..55743d37d32 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -56,7 +56,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.15.1 // indirect github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.43.0 // indirect + github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.9.0 // indirect @@ -75,11 +75,11 @@ require ( go.opentelemetry.io/collector/semconv v0.78.2 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.16.1 // indirect - go.opentelemetry.io/contrib/zpages v0.41.1 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect + go.opentelemetry.io/contrib/zpages v0.42.0 // indirect go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v0.38.1 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect + go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/sdk v1.16.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index e0aa5658d32..2152d74799f 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -345,8 +345,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= -github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -424,16 +424,16 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= -go.opentelemetry.io/contrib/propagators/b3 v1.16.1 h1:Y9Dk1kR93eSHadRTkqnm+QyQVhHthCcvTkoP/Afh7+4= -go.opentelemetry.io/contrib/propagators/b3 v1.16.1/go.mod h1:IR0G6txqoetQrjjdoDGe+udhFegxnQQd0dOJfFS8Jg0= -go.opentelemetry.io/contrib/zpages v0.41.1 h1:FReY8OWFNtYm4mWleTRxTUyD3r02uGcwS6ZeElahs00= -go.opentelemetry.io/contrib/zpages v0.41.1/go.mod h1:C3iy146ccMyv1+gEaxVDDHuoT7yXAKKmbg+twudDpeg= +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.42.0 h1:hFscXKQ9PTjyIVmAr6zIV8cMoiEeR9lPIwPVqHi8+5Q= +go.opentelemetry.io/contrib/zpages v0.42.0/go.mod h1:qRJBEfB0iwRKrYImq5qfwTolmY8HXvZBRucvhuTVQZw= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/bridge/opencensus v0.38.1 h1:LQgPKIZXkaQgesDm39WG1+ikhh1BhKF0NZ2HpPsVrKM= -go.opentelemetry.io/otel/bridge/opencensus v0.38.1/go.mod h1:LCRCnb4WESU7/1qj/FcVPuRa9S8C+Cetk863qoMn0wA= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= +go.opentelemetry.io/otel/bridge/opencensus v0.39.0 h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ= +go.opentelemetry.io/otel/bridge/opencensus v0.39.0/go.mod h1:vZ4537pNjFDXEx//WldAR6Ro2LC8wwmFC76njAXwNPE= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= @@ -538,7 +538,7 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/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.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= 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= diff --git a/confmap/go.mod b/confmap/go.mod index c73652f179c..b655390ec9f 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/knadh/koanf v1.5.0 github.com/mitchellh/mapstructure v1.5.0 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 go.uber.org/multierr v1.11.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/confmap/go.sum b/confmap/go.sum index 4b48170fdd9..7bc1e0cd6a3 100644 --- a/confmap/go.sum +++ b/confmap/go.sum @@ -229,17 +229,13 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/exporter/go.mod b/exporter/go.mod index effb1452dc4..cae611d56fc 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -39,13 +39,13 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.15.1 // indirect github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.43.0 // indirect + github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opentelemetry.io/collector/confmap v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/receiver v0.78.2 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect go.uber.org/atomic v1.10.0 // indirect diff --git a/exporter/go.sum b/exporter/go.sum index b02f71d436e..4d8bbc04db6 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -321,8 +321,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= -github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -380,8 +380,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index ef511bd2006..9c5222e1608 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -234,7 +234,7 @@ github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUo github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -277,7 +277,7 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 95923cf0c1b..7e33e139238 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -246,7 +246,7 @@ github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUo github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -291,7 +291,7 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 09f340f09d7..69d635a44e9 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -248,7 +248,7 @@ github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUo github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -297,7 +297,7 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 79fa220fbc4..23fd9a90dad 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -7,7 +7,7 @@ require ( go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 - go.opentelemetry.io/contrib/zpages v0.41.1 + go.opentelemetry.io/contrib/zpages v0.42.0 go.opentelemetry.io/otel/sdk v1.16.0 go.opentelemetry.io/otel/trace v1.16.0 go.uber.org/zap v1.24.0 diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index 63a1e08b405..361183ae762 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -249,8 +249,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/contrib/zpages v0.41.1 h1:FReY8OWFNtYm4mWleTRxTUyD3r02uGcwS6ZeElahs00= -go.opentelemetry.io/contrib/zpages v0.41.1/go.mod h1:C3iy146ccMyv1+gEaxVDDHuoT7yXAKKmbg+twudDpeg= +go.opentelemetry.io/contrib/zpages v0.42.0 h1:hFscXKQ9PTjyIVmAr6zIV8cMoiEeR9lPIwPVqHi8+5Q= +go.opentelemetry.io/contrib/zpages v0.42.0/go.mod h1:qRJBEfB0iwRKrYImq5qfwTolmY8HXvZBRucvhuTVQZw= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= diff --git a/featuregate/go.mod b/featuregate/go.mod index e4e54235891..a3b71c4cd1e 100644 --- a/featuregate/go.mod +++ b/featuregate/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/featuregate go 1.19 require ( - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.uber.org/multierr v1.11.0 ) diff --git a/featuregate/go.sum b/featuregate/go.sum index bcab6e38506..92780ca9a5d 100644 --- a/featuregate/go.sum +++ b/featuregate/go.sum @@ -1,5 +1,4 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -15,18 +14,12 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/go.mod b/go.mod index 7020c3aad78..daa7246c7cb 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/mostynb/go-grpc-compression v1.1.18 github.com/prometheus/client_golang v1.15.1 github.com/prometheus/client_model v0.4.0 - github.com/prometheus/common v0.43.0 + github.com/prometheus/common v0.44.0 github.com/rs/cors v1.9.0 github.com/shirou/gopsutil/v3 v3.23.4 github.com/spf13/cobra v1.7.0 @@ -28,10 +28,10 @@ require ( go.opentelemetry.io/collector/semconv v0.78.2 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 - go.opentelemetry.io/contrib/propagators/b3 v1.16.1 + go.opentelemetry.io/contrib/propagators/b3 v1.17.0 go.opentelemetry.io/otel v1.16.0 - go.opentelemetry.io/otel/bridge/opencensus v0.38.1 - go.opentelemetry.io/otel/exporters/prometheus v0.38.1 + go.opentelemetry.io/otel/bridge/opencensus v0.39.0 + go.opentelemetry.io/otel/exporters/prometheus v0.39.0 go.opentelemetry.io/otel/metric v1.16.0 go.opentelemetry.io/otel/sdk v1.16.0 go.opentelemetry.io/otel/sdk/metric v0.39.0 @@ -78,7 +78,7 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/contrib/zpages v0.41.1 // indirect + go.opentelemetry.io/contrib/zpages v0.42.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/text v0.9.0 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect diff --git a/go.sum b/go.sum index 02be140f8d9..460e96e4ce1 100644 --- a/go.sum +++ b/go.sum @@ -344,8 +344,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= -github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -423,16 +423,16 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= -go.opentelemetry.io/contrib/propagators/b3 v1.16.1 h1:Y9Dk1kR93eSHadRTkqnm+QyQVhHthCcvTkoP/Afh7+4= -go.opentelemetry.io/contrib/propagators/b3 v1.16.1/go.mod h1:IR0G6txqoetQrjjdoDGe+udhFegxnQQd0dOJfFS8Jg0= -go.opentelemetry.io/contrib/zpages v0.41.1 h1:FReY8OWFNtYm4mWleTRxTUyD3r02uGcwS6ZeElahs00= -go.opentelemetry.io/contrib/zpages v0.41.1/go.mod h1:C3iy146ccMyv1+gEaxVDDHuoT7yXAKKmbg+twudDpeg= +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.42.0 h1:hFscXKQ9PTjyIVmAr6zIV8cMoiEeR9lPIwPVqHi8+5Q= +go.opentelemetry.io/contrib/zpages v0.42.0/go.mod h1:qRJBEfB0iwRKrYImq5qfwTolmY8HXvZBRucvhuTVQZw= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/bridge/opencensus v0.38.1 h1:LQgPKIZXkaQgesDm39WG1+ikhh1BhKF0NZ2HpPsVrKM= -go.opentelemetry.io/otel/bridge/opencensus v0.38.1/go.mod h1:LCRCnb4WESU7/1qj/FcVPuRa9S8C+Cetk863qoMn0wA= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= +go.opentelemetry.io/otel/bridge/opencensus v0.39.0 h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ= +go.opentelemetry.io/otel/bridge/opencensus v0.39.0/go.mod h1:vZ4537pNjFDXEx//WldAR6Ro2LC8wwmFC76njAXwNPE= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= @@ -537,7 +537,7 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/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.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= 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= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 63d0ba1e370..5974cdc71ac 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -7,7 +7,7 @@ require ( github.com/golangci/golangci-lint v1.52.2 github.com/google/addlicense v1.1.1 github.com/jcchavezs/porto v0.4.0 - github.com/mikefarah/yq/v4 v4.33.3 + github.com/mikefarah/yq/v4 v4.34.1 github.com/ory/go-acc v0.2.8 github.com/pavius/impi v0.0.3 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad @@ -157,7 +157,7 @@ require ( github.com/polyfloyd/go-errorlint v1.4.0 // indirect github.com/prometheus/client_golang v1.15.1 // indirect github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.43.0 // indirect + github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/quasilyte/go-ruleguard v0.3.19 // indirect github.com/quasilyte/gogrep v0.5.0 // indirect @@ -187,7 +187,7 @@ require ( github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/stretchr/testify v1.8.2 // indirect + github.com/stretchr/testify v1.8.3 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect github.com/tdakkota/asciicheck v0.2.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index ff8df54c290..c47ab48620e 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -462,8 +462,8 @@ github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwg github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/mgechev/revive v1.3.1 h1:OlQkcH40IB2cGuprTPcjB0iIUddgVZgGmDX3IAMR8D4= github.com/mgechev/revive v1.3.1/go.mod h1:YlD6TTWl2B8A103R9KWJSPVI9DrEf+oqr15q21Ld+5I= -github.com/mikefarah/yq/v4 v4.33.3 h1:cu6JxWAL82bpLCJTLYP3ILZ/3gXF1YfvYBCMRdnY/xA= -github.com/mikefarah/yq/v4 v4.33.3/go.mod h1:ajAKq75gdANZHzkWu5shY2QZHpg8HOHVSyscC1+OAIs= +github.com/mikefarah/yq/v4 v4.34.1 h1:7W+SZXvu1yOxpVXS7Hi5a34nU/gdYPjWMNQqoSlfbxo= +github.com/mikefarah/yq/v4 v4.34.1/go.mod h1:B2JxXiGKqEaU+GTcNwOZ/RQFelq9e6TFIDLRVVFHAu4= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -548,8 +548,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= -github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -653,8 +653,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= diff --git a/pdata/go.mod b/pdata/go.mod index 504aac27ce0..1bf1ff781a7 100644 --- a/pdata/go.mod +++ b/pdata/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/gogo/protobuf v1.3.2 github.com/json-iterator/go v1.1.12 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 go.uber.org/multierr v1.11.0 google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 diff --git a/pdata/go.sum b/pdata/go.sum index df21028d798..07513f02fea 100644 --- a/pdata/go.sum +++ b/pdata/go.sum @@ -33,13 +33,9 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -86,6 +82,5 @@ google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 7508684a9da..23f346e9b4e 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -6,7 +6,7 @@ require ( contrib.go.opencensus.io/exporter/prometheus v0.4.2 github.com/prometheus/client_golang v1.15.1 github.com/prometheus/client_model v0.4.0 - github.com/prometheus/common v0.43.0 + github.com/prometheus/common v0.44.0 github.com/stretchr/testify v1.8.3 go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.78.2 @@ -15,7 +15,7 @@ require ( go.opentelemetry.io/collector/consumer v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel v1.16.0 - go.opentelemetry.io/otel/exporters/prometheus v0.38.1 + go.opentelemetry.io/otel/exporters/prometheus v0.39.0 go.opentelemetry.io/otel/metric v1.16.0 go.opentelemetry.io/otel/sdk v1.16.0 go.opentelemetry.io/otel/sdk/metric v0.39.0 diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index 4f8e35c7aee..d34de3405c3 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -319,8 +319,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= -github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -378,8 +378,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 9148ebe36f8..f62e94c9dd8 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -238,7 +238,7 @@ github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUo github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -292,7 +292,7 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= diff --git a/receiver/go.mod b/receiver/go.mod index 8970261a987..17dbd944c61 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -37,14 +37,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.15.1 // indirect github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.43.0 // indirect + github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/confmap v0.78.2 // indirect go.opentelemetry.io/collector/exporter v0.78.2 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect diff --git a/receiver/go.sum b/receiver/go.sum index 4f8e35c7aee..d34de3405c3 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -319,8 +319,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= -github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -378,8 +378,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 35ad6243eef..67bd8a52f15 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -45,7 +45,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.15.1 // indirect github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.43.0 // indirect + github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.9.0 // indirect @@ -55,7 +55,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/sdk v1.16.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 9b9e0b0fc5a..ae0db5f473f 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -331,8 +331,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.43.0 h1:iq+BVjvYLei5f27wiuNiB1DN6DYQkp1c8Bx0Vykh5us= -github.com/prometheus/common v0.43.0/go.mod h1:NCvr5cQIh3Y/gy73/RdVtC9r8xxrxwJnB+2lB3BxrFc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -396,8 +396,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1 h1:GwalIvFIx91qIA8qyAyqYj9lql5Ba2Oxj/jDG6+3UoU= -go.opentelemetry.io/otel/exporters/prometheus v0.38.1/go.mod h1:6K7aBvWHXRUcNYFSj6Hi5hHwzA1jYflG/T8snrX4dYM= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= +go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= @@ -501,7 +501,7 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/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.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= 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= diff --git a/semconv/go.mod b/semconv/go.mod index 04465b728da..dcb8287abae 100644 --- a/semconv/go.mod +++ b/semconv/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/hashicorp/go-version v1.6.0 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.3 ) require ( diff --git a/semconv/go.sum b/semconv/go.sum index 94dff7ec8b9..0caa62c8941 100644 --- a/semconv/go.sum +++ b/semconv/go.sum @@ -1,5 +1,4 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -17,16 +16,10 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 7b6937aacd0232c7f07f503b20ae7a8a70336914 Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Wed, 31 May 2023 09:42:24 -0700 Subject: [PATCH 11/21] dependabot updates Wed May 31 16:26:18 UTC 2023 (#7801) Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /cmd/builder Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /cmd/otelcorecol Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /component Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /confmap Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /connector/forwardconnector Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /consumer Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /exporter Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /exporter/loggingexporter Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /exporter/otlpexporter Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /exporter/otlphttpexporter Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /extension/ballastextension Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /extension/zpagesextension Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /featuregate Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /pdata Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /processor/batchprocessor Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /processor/memorylimiterprocessor Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /receiver Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /receiver/otlpreceiver Bump github.com/stretchr/testify from 1.8.3 to 1.8.4 in /semconv --- cmd/builder/go.mod | 2 +- cmd/builder/go.sum | 4 ++-- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- component/go.mod | 2 +- component/go.sum | 4 ++-- confmap/go.mod | 2 +- confmap/go.sum | 4 ++-- connector/forwardconnector/go.mod | 2 +- connector/forwardconnector/go.sum | 4 ++-- consumer/go.mod | 2 +- consumer/go.sum | 4 ++-- exporter/go.mod | 2 +- exporter/go.sum | 4 ++-- exporter/loggingexporter/go.mod | 2 +- exporter/loggingexporter/go.sum | 4 ++-- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- extension/ballastextension/go.mod | 2 +- extension/ballastextension/go.sum | 4 ++-- extension/zpagesextension/go.mod | 2 +- extension/zpagesextension/go.sum | 4 ++-- featuregate/go.mod | 2 +- featuregate/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- internal/tools/go.mod | 2 +- internal/tools/go.sum | 4 ++-- pdata/go.mod | 2 +- pdata/go.sum | 4 ++-- processor/batchprocessor/go.mod | 2 +- processor/batchprocessor/go.sum | 4 ++-- processor/memorylimiterprocessor/go.mod | 2 +- processor/memorylimiterprocessor/go.sum | 4 ++-- receiver/go.mod | 2 +- receiver/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- semconv/go.mod | 2 +- semconv/go.sum | 4 ++-- 42 files changed, 63 insertions(+), 63 deletions(-) diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod index 500e4b2f36c..ede9e9412f8 100644 --- a/cmd/builder/go.mod +++ b/cmd/builder/go.mod @@ -9,7 +9,7 @@ require ( github.com/knadh/koanf v1.5.0 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 ) diff --git a/cmd/builder/go.sum b/cmd/builder/go.sum index 978d5ef47c3..c3e7e5e1c5b 100644 --- a/cmd/builder/go.sum +++ b/cmd/builder/go.sum @@ -248,8 +248,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 55743d37d32..480e8ac294f 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -5,7 +5,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/connector/forwardconnector v0.78.2 diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 2152d74799f..97984c17ec8 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -395,8 +395,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= diff --git a/component/go.mod b/component/go.mod index 5ce5b1ed681..7ccadd1033f 100644 --- a/component/go.mod +++ b/component/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/component go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 diff --git a/component/go.sum b/component/go.sum index a062638d6d4..f83872484c1 100644 --- a/component/go.sum +++ b/component/go.sum @@ -238,8 +238,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/confmap/go.mod b/confmap/go.mod index b655390ec9f..c5b6352d462 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/knadh/koanf v1.5.0 github.com/mitchellh/mapstructure v1.5.0 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 go.uber.org/multierr v1.11.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/confmap/go.sum b/confmap/go.sum index 7bc1e0cd6a3..5ef4f0d5b51 100644 --- a/confmap/go.sum +++ b/confmap/go.sum @@ -234,8 +234,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index cb5a039c095..8f49e09eb36 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/connector/forwardconnector go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/consumer v0.78.2 diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index ac7b74197c4..c6eedc6e2f4 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -243,8 +243,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/consumer/go.mod b/consumer/go.mod index b35fd9fe832..31ed689eb6f 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/consumer go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 ) diff --git a/consumer/go.sum b/consumer/go.sum index 811e9811fe4..1488a7d8439 100644 --- a/consumer/go.sum +++ b/consumer/go.sum @@ -27,8 +27,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/exporter/go.mod b/exporter/go.mod index cae611d56fc..31b9c6cb76c 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cenkalti/backoff/v4 v4.2.1 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 diff --git a/exporter/go.sum b/exporter/go.sum index 4d8bbc04db6..43999d43811 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -359,8 +359,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 016088d326c..c49fd03af7f 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/exporter/loggingexporter go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 9c5222e1608..0a4348e6d93 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -265,8 +265,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 6ad530a58b4..ce1ffca947c 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/exporter/otlpexporter go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 7e33e139238..70458260df9 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -277,8 +277,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 885d78f752e..6b541f890ad 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/exporter/otlphttpexporter go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 69d635a44e9..a1614d5f4b0 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -281,8 +281,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 4300ee8fb67..ef9d8a859ec 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/extension/ballastextension go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index cb178b6e53d..f84e68268a4 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -254,8 +254,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 23fd9a90dad..3be2a968b8b 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/extension/zpagesextension go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index 361183ae762..77a33758491 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -241,8 +241,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/featuregate/go.mod b/featuregate/go.mod index a3b71c4cd1e..0868759864d 100644 --- a/featuregate/go.mod +++ b/featuregate/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/featuregate go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.uber.org/multierr v1.11.0 ) diff --git a/featuregate/go.sum b/featuregate/go.sum index 92780ca9a5d..3a025c4981e 100644 --- a/featuregate/go.sum +++ b/featuregate/go.sum @@ -14,8 +14,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/go.mod b/go.mod index daa7246c7cb..05eb7a9a396 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/rs/cors v1.9.0 github.com/shirou/gopsutil/v3 v3.23.4 github.com/spf13/cobra v1.7.0 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 diff --git a/go.sum b/go.sum index 460e96e4ce1..7c63640751a 100644 --- a/go.sum +++ b/go.sum @@ -394,8 +394,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 5974cdc71ac..0aa5c32a4ae 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -187,7 +187,7 @@ require ( github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/stretchr/testify v1.8.3 // indirect + github.com/stretchr/testify v1.8.4 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect github.com/tdakkota/asciicheck v0.2.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index c47ab48620e..a09bcfad80b 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -654,8 +654,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= diff --git a/pdata/go.mod b/pdata/go.mod index 1bf1ff781a7..5dd8b107926 100644 --- a/pdata/go.mod +++ b/pdata/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/gogo/protobuf v1.3.2 github.com/json-iterator/go v1.1.12 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.uber.org/multierr v1.11.0 google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 diff --git a/pdata/go.sum b/pdata/go.sum index 07513f02fea..942b57ebb81 100644 --- a/pdata/go.sum +++ b/pdata/go.sum @@ -34,8 +34,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 23f346e9b4e..5217fdb7ec9 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -7,7 +7,7 @@ require ( github.com/prometheus/client_golang v1.15.1 github.com/prometheus/client_model v0.4.0 github.com/prometheus/common v0.44.0 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index d34de3405c3..54c689f2b39 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -357,8 +357,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 09ddb94c112..ac0f487fb6f 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/processor/memorylimiterprocessor go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index f62e94c9dd8..3afc2ae43dc 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -274,8 +274,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= diff --git a/receiver/go.mod b/receiver/go.mod index 17dbd944c61..bd05471986e 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/receiver go 1.19 require ( - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/consumer v0.78.2 diff --git a/receiver/go.sum b/receiver/go.sum index d34de3405c3..54c689f2b39 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -357,8 +357,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 67bd8a52f15..c7bf35e1c6d 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/gogo/protobuf v1.3.2 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.78.2 go.opentelemetry.io/collector/component v0.78.2 go.opentelemetry.io/collector/confmap v0.78.2 diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index ae0db5f473f..a4bac4375c6 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -371,8 +371,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/semconv/go.mod b/semconv/go.mod index dcb8287abae..f323e77abc9 100644 --- a/semconv/go.mod +++ b/semconv/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/hashicorp/go-version v1.6.0 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 ) require ( diff --git a/semconv/go.sum b/semconv/go.sum index 0caa62c8941..58b69a26f3e 100644 --- a/semconv/go.sum +++ b/semconv/go.sum @@ -16,8 +16,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 54ee55a4a80aaccc44f5420b3912ed760d28d784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Cedomir=20Krsmanovi=C4=87?= Date: Thu, 1 Jun 2023 19:27:16 +0200 Subject: [PATCH 12/21] [docs] fix code reference in configtls readme (#7802) --- config/configtls/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/configtls/README.md b/config/configtls/README.md index 08a2bb518aa..21f4aa83f5d 100644 --- a/config/configtls/README.md +++ b/config/configtls/README.md @@ -41,7 +41,7 @@ __IMPORTANT__: TLS 1.0 and 1.1 are deprecated due to known vulnerabilities and s - `min_version` (default = "1.2"): Minimum acceptable TLS version. - options: ["1.0", "1.1", "1.2", "1.3"] -- `max_version` (default = "" handled by [crypto/tls](https://github.com/golang/go/blob/master/src/crypto/tls/common.go#L700) - currently TLS 1.3): Maximum acceptable TLS version. +- `max_version` (default = "" handled by [crypto/tls](https://github.com/golang/go/blob/ed9db1d36ad6ef61095d5941ad9ee6da7ab6d05a/src/crypto/tls/common.go#L700) - currently TLS 1.3): Maximum acceptable TLS version. - options: ["1.0", "1.1", "1.2", "1.3"] Additionally certificates may be reloaded by setting the below configuration. From 3942fa30721bc8b5c34a690296bd7b1cd620acbe Mon Sep 17 00:00:00 2001 From: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:30:02 -0700 Subject: [PATCH 13/21] [chore][processor/batch] Update description of send_batch_size (#7803) This PR improves the description of the send_batch_size configuration option in the batch processor. The current documentation may not be 100 percent clear to new users of the processor. This change seeks to add clarification that send_batch_size is just a trigger to send and does not enforce limits. --- processor/batchprocessor/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/processor/batchprocessor/README.md b/processor/batchprocessor/README.md index 14af6b9bd34..c63566d05bd 100644 --- a/processor/batchprocessor/README.md +++ b/processor/batchprocessor/README.md @@ -22,7 +22,10 @@ Please refer to [config.go](./config.go) for the config spec. The following configuration options can be modified: - `send_batch_size` (default = 8192): Number of spans, metric data points, or log -records after which a batch will be sent regardless of the timeout. +records after which a batch will be sent regardless of the timeout. `send_batch_size` +acts as a trigger and does not affect the size of the batch. If you need to +enforce batch size limits sent to the next component in the pipeline +see `send_batch_max_size`. - `timeout` (default = 200ms): Time duration after which a batch will be sent regardless of size. If set to zero, `send_batch_size` is ignored as data will be sent immediately, subject to only `send_batch_max_size`. From 1087521c1ddae2f1cae278e7313832fc8bf7f8ac Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 1 Jun 2023 11:43:39 -0700 Subject: [PATCH 14/21] Propose @astencel-sumo as triager (#7807) Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/7778 Signed-off-by: Alex Boten --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 617d3c235ed..d1ae701b0cd 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,7 @@ Here is a list of community roles with current and previous members: - Triagers ([@open-telemetry/collector-triagers](https://github.com/orgs/open-telemetry/teams/collector-triagers)): + - [Andrzej Stencel](https://github.com/astencel-sumo), Sumo Logic - [Antoine Toulme](https://github.com/atoulme), Splunk - Actively seeking contributors to triage issues From 9104611422faff37dd738157d068540ed20a6447 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 1 Jun 2023 11:43:57 -0700 Subject: [PATCH 15/21] [chore] minor fix in the doc (#7808) SendBatchSize was incorrectly saying that a value of 0 implies ignoring the timeout. Signed-off-by: Alex Boten --- processor/batchprocessor/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processor/batchprocessor/config.go b/processor/batchprocessor/config.go index c0b918e88ba..4d87900a17d 100644 --- a/processor/batchprocessor/config.go +++ b/processor/batchprocessor/config.go @@ -19,7 +19,7 @@ type Config struct { Timeout time.Duration `mapstructure:"timeout"` // SendBatchSize is the size of a batch which after hit, will trigger it to be sent. - // SendBatchSize of 0 implies ignoring timeout, data will be sent immediately + // When this is set to zero, the batch size is ignored and data will be sent immediately // subject to only send_batch_max_size. SendBatchSize uint32 `mapstructure:"send_batch_size"` From 604c33d15801c68b0d09fd53cec461b971b4122f Mon Sep 17 00:00:00 2001 From: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Date: Thu, 1 Jun 2023 17:56:41 -0400 Subject: [PATCH 16/21] Add connectors to the components command (#7809) Add connector components to the output of the components command. Co-authored-by: Evan Bradley --- .../add-connectors-to-components-command.yaml | 16 ++++++++++++++++ otelcol/command_components.go | 4 ++++ otelcol/command_components_test.go | 1 + otelcol/configprovider_test.go | 6 ++++-- otelcol/factories_test.go | 6 ++++++ otelcol/testdata/otelcol-nop.yaml | 7 +++++-- 6 files changed, 36 insertions(+), 4 deletions(-) create mode 100755 .chloggen/add-connectors-to-components-command.yaml diff --git a/.chloggen/add-connectors-to-components-command.yaml b/.chloggen/add-connectors-to-components-command.yaml new file mode 100755 index 00000000000..6a7d34fca12 --- /dev/null +++ b/.chloggen/add-connectors-to-components-command.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otelcol + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add connectors to output of the `components` command + +# One or more tracking issues or pull requests related to the change +issues: [7809] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/otelcol/command_components.go b/otelcol/command_components.go index 783f082f272..23388280122 100644 --- a/otelcol/command_components.go +++ b/otelcol/command_components.go @@ -17,6 +17,7 @@ type componentsOutput struct { Receivers []component.Type Processors []component.Type Exporters []component.Type + Connectors []component.Type Extensions []component.Type } @@ -29,6 +30,9 @@ func newBuildSubCommand(set CollectorSettings) *cobra.Command { RunE: func(cmd *cobra.Command, args []string) error { components := componentsOutput{} + for con := range set.Factories.Connectors { + components.Connectors = append(components.Connectors, con) + } for ext := range set.Factories.Extensions { components.Extensions = append(components.Extensions, ext) } diff --git a/otelcol/command_components_test.go b/otelcol/command_components_test.go index 81920eb7d52..37e923276f5 100644 --- a/otelcol/command_components_test.go +++ b/otelcol/command_components_test.go @@ -36,6 +36,7 @@ func TestNewBuildSubCommand(t *testing.T) { Receivers: []component.Type{"nop"}, Processors: []component.Type{"nop"}, Exporters: []component.Type{"nop"}, + Connectors: []component.Type{"nop"}, Extensions: []component.Type{"nop"}, } ExpectedOutput, err := yaml.Marshal(ExpectedYamlStruct) diff --git a/otelcol/configprovider_test.go b/otelcol/configprovider_test.go index 464af306456..7584950bd40 100644 --- a/otelcol/configprovider_test.go +++ b/otelcol/configprovider_test.go @@ -18,6 +18,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/provider/fileprovider" "go.opentelemetry.io/collector/confmap/provider/yamlprovider" + "go.opentelemetry.io/collector/connector/connectortest" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/extension/extensiontest" "go.opentelemetry.io/collector/processor/processortest" @@ -30,6 +31,7 @@ var configNop = &Config{ Receivers: map[component.ID]component.Config{component.NewID("nop"): receivertest.NewNopFactory().CreateDefaultConfig()}, Processors: map[component.ID]component.Config{component.NewID("nop"): processortest.NewNopFactory().CreateDefaultConfig()}, Exporters: map[component.ID]component.Config{component.NewID("nop"): exportertest.NewNopFactory().CreateDefaultConfig()}, + Connectors: map[component.ID]component.Config{component.NewIDWithName("nop", "con"): connectortest.NewNopFactory().CreateDefaultConfig()}, Extensions: map[component.ID]component.Config{component.NewID("nop"): extensiontest.NewNopFactory().CreateDefaultConfig()}, Service: service.Config{ Extensions: []component.ID{component.NewID("nop")}, @@ -37,7 +39,7 @@ var configNop = &Config{ component.NewID("traces"): { Receivers: []component.ID{component.NewID("nop")}, Processors: []component.ID{component.NewID("nop")}, - Exporters: []component.ID{component.NewID("nop")}, + Exporters: []component.ID{component.NewID("nop"), component.NewIDWithName("nop", "con")}, }, component.NewID("metrics"): { Receivers: []component.ID{component.NewID("nop")}, @@ -45,7 +47,7 @@ var configNop = &Config{ Exporters: []component.ID{component.NewID("nop")}, }, component.NewID("logs"): { - Receivers: []component.ID{component.NewID("nop")}, + Receivers: []component.ID{component.NewID("nop"), component.NewIDWithName("nop", "con")}, Processors: []component.ID{component.NewID("nop")}, Exporters: []component.ID{component.NewID("nop")}, }, diff --git a/otelcol/factories_test.go b/otelcol/factories_test.go index 869a4c01f20..645d59c7db2 100644 --- a/otelcol/factories_test.go +++ b/otelcol/factories_test.go @@ -4,6 +4,8 @@ package otelcol import ( + "go.opentelemetry.io/collector/connector" + "go.opentelemetry.io/collector/connector/connectortest" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/extension" @@ -18,6 +20,10 @@ func nopFactories() (Factories, error) { var factories Factories var err error + if factories.Connectors, err = connector.MakeFactoryMap(connectortest.NewNopFactory()); err != nil { + return Factories{}, err + } + if factories.Extensions, err = extension.MakeFactoryMap(extensiontest.NewNopFactory()); err != nil { return Factories{}, err } diff --git a/otelcol/testdata/otelcol-nop.yaml b/otelcol/testdata/otelcol-nop.yaml index 6780b937e13..c83a07c536c 100644 --- a/otelcol/testdata/otelcol-nop.yaml +++ b/otelcol/testdata/otelcol-nop.yaml @@ -10,6 +10,9 @@ exporters: extensions: nop: +connectors: + nop/con: + service: telemetry: metrics: @@ -19,12 +22,12 @@ service: traces: receivers: [nop] processors: [nop] - exporters: [nop] + exporters: [nop, nop/con] metrics: receivers: [nop] processors: [nop] exporters: [nop] logs: - receivers: [nop] + receivers: [nop, nop/con] processors: [nop] exporters: [nop] From deffd489200246fd3ca8650d5ce0269437820fb9 Mon Sep 17 00:00:00 2001 From: Tigran Najaryan <4194920+tigrannajaryan@users.noreply.github.com> Date: Thu, 1 Jun 2023 19:49:53 -0400 Subject: [PATCH 17/21] Add receiver/consumer contract test helper (#7516) - Added a CheckConsumeContract() helper func that can be used to test the contract that receivers are expected to maintain for Consume() calls. - Added an example usage of CheckConsumeContract() helper. --- receiver/receivertest/contract_checker.go | 439 ++++++++++++++++++ .../receivertest/contract_checker_test.go | 126 +++++ 2 files changed, 565 insertions(+) create mode 100644 receiver/receivertest/contract_checker.go create mode 100644 receiver/receivertest/contract_checker_test.go diff --git a/receiver/receivertest/contract_checker.go b/receiver/receivertest/contract_checker.go new file mode 100644 index 00000000000..7bd71d4c3a9 --- /dev/null +++ b/receiver/receivertest/contract_checker.go @@ -0,0 +1,439 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package receivertest // import "go.opentelemetry.io/collector/receiver/receivertest" + +import ( + "context" + "errors" + "fmt" + "math/rand" + "sync" + "sync/atomic" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/receiver" +) + +// UniqueIDAttrName is the attribute name that is used in log records/spans/datapoints as the unique identifier. +const UniqueIDAttrName = "test_id" + +// UniqueIDAttrVal is the value type of the UniqueIDAttrName. +type UniqueIDAttrVal string + +type Generator interface { + // Start the generator and prepare to generate. Will be followed by calls to Generate(). + // Start() may be called again after Stop() is called to begin a new test scenario. + Start() + + // Stop generating. There will be no more calls to Generate() until Start() is called again. + Stop() + + // Generate must generate and send at least one data element (span, log record or metric data point) + // to the receiver and return a copy of generated element ids. + // The generated data must contain uniquely identifiable elements, each with a + // different value of attribute named UniqueIDAttrName. + // CreateOneLogWithID() can be used a helper to create such logs. + // May be called concurrently from multiple goroutines. + Generate() []UniqueIDAttrVal +} + +type CheckConsumeContractParams struct { + T *testing.T + // Factory that allows to create a receiver. + Factory receiver.Factory + // DataType to test for. + DataType component.DataType + // Config of the receiver to use. + Config component.Config + // Generator that can send data to the receiver. + Generator Generator + // GenerateCount specifies the number of times to call the generator.Generate() + // for each test scenario. + GenerateCount int +} + +// CheckConsumeContract checks the contract between the receiver and its next consumer. For the contract +// description see ../doc.go. The checker will detect violations of contract on different scenarios: on success, +// on permanent and non-permanent errors and mix of error types. +func CheckConsumeContract(params CheckConsumeContractParams) { + // Different scenarios to test for. + // The decision function defines the testing scenario (i.e. to test for + // success case or for error case or a mix of both). See for example randomErrorsConsumeDecision. + scenarios := []struct { + name string + decisionFunc func(ids idSet) error + }{ + { + name: "always_succeed", + // Always succeed. We expect all data to be delivered as is. + decisionFunc: func(ids idSet) error { return nil }, + }, + { + name: "random_non_permanent_error", + decisionFunc: randomNonPermanentErrorConsumeDecision, + }, + { + name: "random_permanent_error", + decisionFunc: randomPermanentErrorConsumeDecision, + }, + { + name: "random_error", + decisionFunc: randomErrorsConsumeDecision, + }, + } + + for _, scenario := range scenarios { + params.T.Run( + scenario.name, func(t *testing.T) { + checkConsumeContractScenario(params, scenario.decisionFunc) + }, + ) + } +} + +func checkConsumeContractScenario(params CheckConsumeContractParams, decisionFunc func(ids idSet) error) { + consumer := &mockConsumer{t: params.T, consumeDecisionFunc: decisionFunc} + ctx := context.Background() + + // Create and start the receiver. + var receiver component.Component + var err error + switch params.DataType { + case component.DataTypeLogs: + receiver, err = params.Factory.CreateLogsReceiver(ctx, NewNopCreateSettings(), params.Config, consumer) + case component.DataTypeTraces: + receiver, err = params.Factory.CreateTracesReceiver(ctx, NewNopCreateSettings(), params.Config, consumer) + case component.DataTypeMetrics: + // TODO: add metrics support to mockConsumer so that this case can be also implemented. + require.FailNow(params.T, "DataTypeMetrics is not implemented") + default: + require.FailNow(params.T, "must specify a valid DataType to test for") + } + + require.NoError(params.T, err) + + err = receiver.Start(ctx, componenttest.NewNopHost()) + require.NoError(params.T, err) + + // Begin generating data to the receiver. + + var generatedIds idSet + var generatedIndex int64 + var mux sync.Mutex + var wg sync.WaitGroup + + const concurrency = 4 + + params.Generator.Start() + defer params.Generator.Stop() + + // Create concurrent goroutines that use the generator. + // The total number of generator calls will be equal to params.GenerateCount. + + for j := 0; j < concurrency; j++ { + wg.Add(1) + go func() { + defer wg.Done() + for atomic.AddInt64(&generatedIndex, 1) <= int64(params.GenerateCount) { + ids := params.Generator.Generate() + require.Greater(params.T, len(ids), 0) + + mux.Lock() + duplicates := generatedIds.mergeSlice(ids) + mux.Unlock() + + // Check that the generator works correctly. There may not be any duplicates in the + // generated data set. + require.Empty(params.T, duplicates) + } + }() + } + + // Wait until all generator goroutines are done. + wg.Wait() + + // Wait until all data is seen by the consumer. + assert.Eventually(params.T, func() bool { + // Calculate the union of accepted and dropped data. + acceptedAndDropped, duplicates := consumer.acceptedAndDropped() + if len(duplicates) != 0 { + assert.Failf(params.T, "found duplicate elements in received and dropped data", "keys=%v", duplicates) + } + // Compare accepted+dropped with generated. Once they are equal it means all data is seen by the consumer. + missingInOther, onlyInOther := generatedIds.compare(acceptedAndDropped) + return len(missingInOther) == 0 && len(onlyInOther) == 0 + }, 5*time.Second, 10*time.Millisecond) + + // Do some final checks. Need the union of accepted and dropped data again. + acceptedAndDropped, duplicates := consumer.acceptedAndDropped() + if len(duplicates) != 0 { + assert.Failf(params.T, "found duplicate elements in accepted and dropped data", "keys=%v", duplicates) + } + + // Make sure generated and accepted+dropped are exactly the same. + + missingInOther, onlyInOther := generatedIds.compare(acceptedAndDropped) + if len(missingInOther) != 0 { + assert.Failf(params.T, "found elements sent that were not delivered", "keys=%v", missingInOther) + } + if len(onlyInOther) != 0 { + assert.Failf(params.T, "found elements in accepted and dropped data that was never sent", "keys=%v", onlyInOther) + } + + err = receiver.Shutdown(ctx) + assert.NoError(params.T, err) + + // Print some stats to help debug test failures. + fmt.Printf( + "Sent %d, accepted=%d, expected dropped=%d, non-permanent errors retried=%d\n", + len(generatedIds), + len(consumer.acceptedIds), + len(consumer.droppedIds), + consumer.nonPermanentFailures, + ) +} + +// idSet is a set of unique ids of data elements used in the test (logs, spans or metric data points). +type idSet map[UniqueIDAttrVal]bool + +// compare to another set and calculate the differences from this set. +func (ds idSet) compare(other idSet) (missingInOther, onlyInOther []UniqueIDAttrVal) { + for k := range ds { + if _, ok := other[k]; !ok { + missingInOther = append(missingInOther, k) + } + } + for k := range other { + if _, ok := ds[k]; !ok { + onlyInOther = append(onlyInOther, k) + } + } + return +} + +// merge another set into this one and return a list of duplicate ids. +func (ds *idSet) merge(other idSet) (duplicates []UniqueIDAttrVal) { + if *ds == nil { + *ds = map[UniqueIDAttrVal]bool{} + } + for k, v := range other { + if _, ok := (*ds)[k]; ok { + duplicates = append(duplicates, k) + } else { + (*ds)[k] = v + } + } + return +} + +// merge another set into this one and return a list of duplicate ids. +func (ds *idSet) mergeSlice(other []UniqueIDAttrVal) (duplicates []UniqueIDAttrVal) { + if *ds == nil { + *ds = map[UniqueIDAttrVal]bool{} + } + for _, id := range other { + if _, ok := (*ds)[id]; ok { + duplicates = append(duplicates, id) + } else { + (*ds)[id] = true + } + } + return +} + +// union computes the union of this and another sets. A new set if created to return the result. +// Also returns a list of any duplicate ids found. +func (ds *idSet) union(other idSet) (union idSet, duplicates []UniqueIDAttrVal) { + union = map[UniqueIDAttrVal]bool{} + for k, v := range *ds { + union[k] = v + } + for k, v := range other { + if _, ok := union[k]; ok { + duplicates = append(duplicates, k) + } else { + union[k] = v + } + } + return +} + +// A function that returns a value indicating what the receiver's next consumer decides +// to do as a result of ConsumeLogs/Trace/Metrics call. +// The result of the decision function becomes the return value of ConsumeLogs/Trace/Metrics. +// Supplying different decision functions allows to test different scenarios of the contract +// between the receiver and it next consumer. +type consumeDecisionFunc func(ids idSet) error + +var errNonPermanent = errors.New("non permanent error") +var errPermanent = errors.New("permanent error") + +// randomNonPermanentErrorConsumeDecision is a decision function that succeeds approximately +// half of the time and fails with a non-permanent error the rest of the time. +func randomNonPermanentErrorConsumeDecision(_ idSet) error { + if rand.Float32() < 0.5 { + return errNonPermanent + } + return nil +} + +// randomPermanentErrorConsumeDecision is a decision function that succeeds approximately +// half of the time and fails with a permanent error the rest of the time. +func randomPermanentErrorConsumeDecision(_ idSet) error { + if rand.Float32() < 0.5 { + return consumererror.NewPermanent(errPermanent) + } + return nil +} + +// randomErrorsConsumeDecision is a decision function that succeeds approximately +// a third of the time, fails with a permanent error the third of the time and fails with +// a non-permanent error the rest of the time. +func randomErrorsConsumeDecision(_ idSet) error { + r := rand.Float64() + third := 1.0 / 3.0 + if r < third { + return consumererror.NewPermanent(errPermanent) + } + if r < 2*third { + return errNonPermanent + } + return nil +} + +// mockConsumer accepts or drops the data from the receiver based on the decision made by +// consumeDecisionFunc and remembers the accepted and dropped data sets for later checks. +// mockConsumer implements all 3 consume functions: ConsumeLogs/ConsumeTraces/ConsumeMetrics +// and can be used for testing any of the 3 signals. +type mockConsumer struct { + t *testing.T + consumeDecisionFunc consumeDecisionFunc + mux sync.Mutex + acceptedIds idSet + droppedIds idSet + nonPermanentFailures int +} + +func (m *mockConsumer) Capabilities() consumer.Capabilities { + return consumer.Capabilities{} +} + +func (m *mockConsumer) ConsumeTraces(_ context.Context, data ptrace.Traces) error { + ids, err := idSetFromTraces(data) + require.NoError(m.t, err) + return m.consume(ids) +} + +// idSetFromTraces computes an idSet from given ptrace.Traces. The idSet will contain ids of all spans. +func idSetFromTraces(data ptrace.Traces) (idSet, error) { + ds := map[UniqueIDAttrVal]bool{} + rss := data.ResourceSpans() + for i := 0; i < rss.Len(); i++ { + ils := rss.At(i).ScopeSpans() + for j := 0; j < ils.Len(); j++ { + ss := ils.At(j).Spans() + for k := 0; k < ss.Len(); k++ { + elem := ss.At(k) + key, exists := elem.Attributes().Get(UniqueIDAttrName) + if !exists { + return ds, fmt.Errorf("invalid data element, attribute %q is missing", UniqueIDAttrName) + } + if key.Type() != pcommon.ValueTypeStr { + return ds, fmt.Errorf("invalid data element, attribute %q is wrong type %v", UniqueIDAttrName, key.Type()) + } + ds[UniqueIDAttrVal(key.Str())] = true + } + } + } + return ds, nil +} + +func (m *mockConsumer) ConsumeLogs(_ context.Context, data plog.Logs) error { + ids, err := idSetFromLogs(data) + require.NoError(m.t, err) + return m.consume(ids) +} + +// idSetFromLogs computes an idSet from given plog.Logs. The idSet will contain ids of all log records. +func idSetFromLogs(data plog.Logs) (idSet, error) { + ds := map[UniqueIDAttrVal]bool{} + rss := data.ResourceLogs() + for i := 0; i < rss.Len(); i++ { + ils := rss.At(i).ScopeLogs() + for j := 0; j < ils.Len(); j++ { + ss := ils.At(j).LogRecords() + for k := 0; k < ss.Len(); k++ { + elem := ss.At(k) + key, exists := elem.Attributes().Get(UniqueIDAttrName) + if !exists { + return ds, fmt.Errorf("invalid data element, attribute %q is missing", UniqueIDAttrName) + } + if key.Type() != pcommon.ValueTypeStr { + return ds, fmt.Errorf("invalid data element, attribute %q is wrong type %v", UniqueIDAttrName, key.Type()) + } + ds[UniqueIDAttrVal(key.Str())] = true + } + } + } + return ds, nil +} + +// TODO: Implement mockConsumer.ConsumeMetrics() + +// consume the elements with the specified ids, regardless of the element data type. +func (m *mockConsumer) consume(ids idSet) error { + m.mux.Lock() + defer m.mux.Unlock() + + // Consult with user-defined decision function to decide what to do with the data. + if err := m.consumeDecisionFunc(ids); err != nil { + // The decision is to return an error to the receiver. + + if consumererror.IsPermanent(err) { + // It is a permanent error, which means we need to drop the data. + // Remember the ids of dropped elements. + duplicates := m.droppedIds.merge(ids) + require.Empty(m.t, duplicates, "elements that were dropped previously were sent again") + } else { + // It is a non-permanent error. Don't add it to the drop list. Remember the number of + // failures to print at the end of the test. + m.nonPermanentFailures++ + } + // Return the error to the receiver. + return err + } + + // The decision is a success. Remember the ids of the data in the accepted list. + duplicates := m.acceptedIds.merge(ids) + require.Empty(m.t, duplicates, "elements that were accepted previously were sent again") + return nil +} + +// Calculate union of accepted and dropped ids. +// Returns the union and the list of duplicates between the two sets (if any) +func (m *mockConsumer) acceptedAndDropped() (acceptedAndDropped idSet, duplicates []UniqueIDAttrVal) { + m.mux.Lock() + defer m.mux.Unlock() + return m.acceptedIds.union(m.droppedIds) +} + +func CreateOneLogWithID(id UniqueIDAttrVal) plog.Logs { + data := plog.NewLogs() + data.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty().Attributes().PutStr( + UniqueIDAttrName, + string(id), + ) + return data +} diff --git a/receiver/receivertest/contract_checker_test.go b/receiver/receivertest/contract_checker_test.go new file mode 100644 index 00000000000..2212d0b6196 --- /dev/null +++ b/receiver/receivertest/contract_checker_test.go @@ -0,0 +1,126 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package receivertest + +import ( + "context" + "strconv" + "sync/atomic" + "testing" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver" +) + +// This file is an example that demonstrates how to use the CheckConsumeContract() function. +// We declare a trivial example receiver, a data generator and then use them in TestConsumeContract(). + +type exampleReceiver struct { + nextConsumer consumer.Logs +} + +func (s *exampleReceiver) Start(_ context.Context, _ component.Host) error { + return nil +} + +func (s *exampleReceiver) Shutdown(_ context.Context) error { + return nil +} + +func (s *exampleReceiver) Receive(data plog.Logs) { + // This very simple implementation demonstrates how a single items receiving should happen. + for { + err := s.nextConsumer.ConsumeLogs(context.Background(), data) + if err != nil { + // The next consumer returned an error. + if !consumererror.IsPermanent(err) { + // It is not a permanent error, so we must retry sending it again. In network-based + // receivers instead we can ask our sender to re-retry the same data again later. + // We may also pause here a bit if we don't want to hammer the next consumer. + continue + } + } + // If we are hear either the ConsumeLogs returned success or it returned a permanent error. + // In either case we don't need to retry the same data, we are done. + return + } +} + +// A config for exampleReceiver. +type exampleReceiverConfig struct { + generator *exampleGenerator +} + +// A generator that can send data to exampleReceiver. +type exampleGenerator struct { + t *testing.T + receiver *exampleReceiver + sequenceNum int64 +} + +func (g *exampleGenerator) Start() { + g.sequenceNum = 0 +} + +func (g *exampleGenerator) Stop() {} + +func (g *exampleGenerator) Generate() []UniqueIDAttrVal { + // Make sure the id is atomically incremented. Generate() may be called concurrently. + id := UniqueIDAttrVal(strconv.FormatInt(atomic.AddInt64(&g.sequenceNum, 1), 10)) + + data := CreateOneLogWithID(id) + + // Send the generated data to the receiver. + g.receiver.Receive(data) + + // And return the ids for bookkeeping by the test. + return []UniqueIDAttrVal{id} +} + +func newExampleFactory() receiver.Factory { + return receiver.NewFactory( + "example_receiver", + func() component.Config { + return &exampleReceiverConfig{} + }, + receiver.WithLogs(createLog, component.StabilityLevelBeta), + ) +} + +func createLog( + _ context.Context, + _ receiver.CreateSettings, + cfg component.Config, + consumer consumer.Logs, +) (receiver.Logs, error) { + rcv := &exampleReceiver{nextConsumer: consumer} + cfg.(*exampleReceiverConfig).generator.receiver = rcv + return rcv, nil +} + +// TestConsumeContract is an example of testing of the receiver for the contract between the +// receiver and next consumer. +func TestConsumeContract(t *testing.T) { + + // Number of log records to send per scenario. + const logsPerTest = 100 + + generator := &exampleGenerator{t: t} + cfg := &exampleReceiverConfig{generator: generator} + + params := CheckConsumeContractParams{ + T: t, + Factory: newExampleFactory(), + DataType: component.DataTypeLogs, + Config: cfg, + Generator: generator, + GenerateCount: logsPerTest, + } + + // Run the contract checker. This will trigger test failures if any problems are found. + CheckConsumeContract(params) +} From ce6535092daee23d1d7492844dee639a24cd803d Mon Sep 17 00:00:00 2001 From: Sean Marciniak <30928402+MovieStoreGuy@users.noreply.github.com> Date: Sat, 3 Jun 2023 03:26:52 +0930 Subject: [PATCH 18/21] [scrapehelper] Make the initial scrape interval configurable (#7635) This change will allow scrapers to start gather values on scrape controller start instead of having to wait for scrape controller duration to perform the initial scrape. This is particularly useful for components such as hostmetrics receiver that generate utilization metrics that require an initial state to compute that value. With this change, it means that this metrics will start being sent from Start + Duration instead of Start + 2*Duration which for scrape durations like 30s means that this value won't be sent til a minute has elapsed. --- .chloggen/msg_enhacement-scrape-on-start.yaml | 19 ++++ receiver/scraperhelper/scrapercontroller.go | 12 ++ .../scraperhelper/scrapercontroller_test.go | 106 ++++++++++++++++-- 3 files changed, 125 insertions(+), 12 deletions(-) create mode 100755 .chloggen/msg_enhacement-scrape-on-start.yaml diff --git a/.chloggen/msg_enhacement-scrape-on-start.yaml b/.chloggen/msg_enhacement-scrape-on-start.yaml new file mode 100755 index 00000000000..a41b093543f --- /dev/null +++ b/.chloggen/msg_enhacement-scrape-on-start.yaml @@ -0,0 +1,19 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: scraperhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Will start calling scrapers on component start. + +# One or more tracking issues or pull requests related to the change +issues: [7635] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The change allows scrapes to perform their initial scrape on component start + and provide an initial delay. This means that scrapes will be delayed by `initial_delay` + before first scrape and then run on `collection_interval` for each consecutive interval. diff --git a/receiver/scraperhelper/scrapercontroller.go b/receiver/scraperhelper/scrapercontroller.go index 5e45ca6002e..04f818d74e5 100644 --- a/receiver/scraperhelper/scrapercontroller.go +++ b/receiver/scraperhelper/scrapercontroller.go @@ -24,6 +24,7 @@ import ( // of receiver.Settings, and extend it with more fields if needed. type ScraperControllerSettings struct { CollectionInterval time.Duration `mapstructure:"collection_interval"` + InitialDelay time.Duration `mapstructure:"initial_delay"` } // NewDefaultScraperControllerSettings returns default scraper controller @@ -31,6 +32,7 @@ type ScraperControllerSettings struct { func NewDefaultScraperControllerSettings(component.Type) ScraperControllerSettings { return ScraperControllerSettings{ CollectionInterval: time.Minute, + InitialDelay: time.Second, } } @@ -61,6 +63,7 @@ type controller struct { id component.ID logger *zap.Logger collectionInterval time.Duration + initialDelay time.Duration nextConsumer consumer.Metrics scrapers []Scraper @@ -104,6 +107,7 @@ func NewScraperControllerReceiver( id: set.ID, logger: set.Logger, collectionInterval: cfg.CollectionInterval, + initialDelay: cfg.InitialDelay, nextConsumer: nextConsumer, done: make(chan struct{}), terminated: make(chan struct{}), @@ -167,6 +171,10 @@ func (sc *controller) Shutdown(ctx context.Context) error { // collection interval. func (sc *controller) startScraping() { go func() { + if sc.initialDelay > 0 { + <-time.After(sc.initialDelay) + } + if sc.tickerCh == nil { ticker := time.NewTicker(sc.collectionInterval) defer ticker.Stop() @@ -174,6 +182,10 @@ func (sc *controller) startScraping() { sc.tickerCh = ticker.C } + // Call scrape method on initialision to ensure + // that scrapers start from when the component starts + // instead of waiting for the full duration to start. + sc.scrapeMetricsAndReport(context.Background()) for { select { case <-sc.tickerCh: diff --git a/receiver/scraperhelper/scrapercontroller_test.go b/receiver/scraperhelper/scrapercontroller_test.go index 8c7d13e9e35..bcd5e54acf8 100644 --- a/receiver/scraperhelper/scrapercontroller_test.go +++ b/receiver/scraperhelper/scrapercontroller_test.go @@ -64,6 +64,13 @@ func (ts *testScrapeMetrics) scrape(_ context.Context) (pmetric.Metrics, error) return md, nil } +func newTestNoDelaySettings() *ScraperControllerSettings { + return &ScraperControllerSettings{ + CollectionInterval: time.Second, + InitialDelay: 0, + } +} + type metricsTestCase struct { name string @@ -108,10 +115,11 @@ func TestScrapeController(t *testing.T) { scrapeErr: errors.New("err1"), }, { - name: "AddMetricsScrapersWithInitializeAndClose", - scrapers: 2, - initialize: true, - close: true, + name: "AddMetricsScrapersWithInitializeAndClose", + scrapers: 2, + initialize: true, + expectScraped: true, + close: true, }, { name: "AddMetricsScrapersWithInitializeAndCloseErrors", @@ -124,6 +132,7 @@ func TestScrapeController(t *testing.T) { } for _, test := range testCases { + test := test t.Run(test.name, func(t *testing.T) { tt, err := obsreporttest.SetupTelemetry(component.NewID("receiver")) require.NoError(t, err) @@ -142,8 +151,7 @@ func TestScrapeController(t *testing.T) { if !test.nilNextConsumer { nextConsumer = sink } - defaultCfg := NewDefaultScraperControllerSettings("receiver") - cfg := &defaultCfg + cfg := newTestNoDelaySettings() if test.scraperControllerSettings != nil { cfg = test.scraperControllerSettings } @@ -167,6 +175,10 @@ func TestScrapeController(t *testing.T) { if test.expectScraped || test.scrapeErr != nil { // validate that scrape is called at least N times for each configured scraper + for _, ch := range scrapeMetricsChs { + <-ch + } + // Consume the initial scrapes on start for i := 0; i < iterations; i++ { tickerCh <- time.Now() @@ -178,7 +190,7 @@ func TestScrapeController(t *testing.T) { // wait until all calls to scrape have completed if test.scrapeErr == nil { require.Eventually(t, func() bool { - return sink.DataPointCount() == iterations*(test.scrapers) + return sink.DataPointCount() == (1+iterations)*(test.scrapers) }, time.Second, time.Millisecond) } @@ -316,12 +328,11 @@ func assertScraperViews(t *testing.T, tt obsreporttest.TestTelemetry, expectedEr require.NoError(t, obsreporttest.CheckScraperMetrics(tt, component.NewID("receiver"), component.NewID("scraper"), expectedScraped, expectedErrored)) } -func TestSingleScrapePerTick(t *testing.T) { +func TestSingleScrapePerInterval(t *testing.T) { scrapeMetricsCh := make(chan int, 10) tsm := &testScrapeMetrics{ch: scrapeMetricsCh} - defaultCfg := NewDefaultScraperControllerSettings("") - cfg := &defaultCfg + cfg := newTestNoDelaySettings() tickerCh := make(chan time.Time) @@ -341,12 +352,83 @@ func TestSingleScrapePerTick(t *testing.T) { tickerCh <- time.Now() - assert.Equal(t, 1, <-scrapeMetricsCh) + assert.Eventually( + t, + func() bool { + return <-scrapeMetricsCh == 2 + }, + 300*time.Millisecond, + 100*time.Millisecond, + "Make sure the scraper channel is called twice", + ) select { case <-scrapeMetricsCh: - assert.Fail(t, "Scrape was called more than once") + assert.Fail(t, "Scrape was called more than twice") case <-time.After(100 * time.Millisecond): return } } + +func TestScrapeControllerStartsOnInit(t *testing.T) { + t.Parallel() + + tsm := &testScrapeMetrics{ + ch: make(chan int, 1), + } + + scp, err := NewScraper("", tsm.scrape) + require.NoError(t, err, "Must not error when creating scraper") + + r, err := NewScraperControllerReceiver( + &ScraperControllerSettings{ + CollectionInterval: time.Hour, + InitialDelay: 0, + }, + receivertest.NewNopCreateSettings(), + new(consumertest.MetricsSink), + AddScraper(scp), + ) + require.NoError(t, err, "Must not error when creating scrape controller") + + assert.NoError(t, r.Start(context.Background(), componenttest.NewNopHost()), "Must not error on start") + <-time.After(500 * time.Nanosecond) + assert.NoError(t, r.Shutdown(context.Background()), "Must not have errored on shutdown") + assert.Equal(t, tsm.timesScrapeCalled, 1, "Must have been called as soon as the controller started") +} + +func TestScrapeControllerInitialDelay(t *testing.T) { + if testing.Short() { + t.Skip("This requires real time to pass, skipping") + return + } + + t.Parallel() + + var ( + elapsed = make(chan time.Time, 1) + cfg = NewDefaultScraperControllerSettings("my-delayed-scraper") + ) + + scp, err := NewScraper("timed", func(ctx context.Context) (pmetric.Metrics, error) { + elapsed <- time.Now() + return pmetric.NewMetrics(), nil + }) + require.NoError(t, err, "Must not error when creating scraper") + + r, err := NewScraperControllerReceiver( + &cfg, + receivertest.NewNopCreateSettings(), + new(consumertest.MetricsSink), + AddScraper(scp), + ) + require.NoError(t, err, "Must not error when creating receiver") + + t0 := time.Now() + require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost()), "Must not error when starting") + t1 := <-elapsed + + assert.GreaterOrEqual(t, t1.Sub(t0), 300*time.Millisecond, "Must have had 300ms pass as defined by initial delay") + + assert.NoError(t, r.Shutdown(context.Background()), "Must not error closing down") +} From 6ababc9c71489f1b13fdb264657c0bdd187a856f Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Mon, 5 Jun 2023 09:03:01 -0600 Subject: [PATCH 19/21] Incorporate next consumer's capabilities into connector capabilities (#7779) Resolves #7776 The collector copies data whenever handing it to components that may mutate it. The point at which a copy must be made is within a fanout consumer. There are two points at which a fanout consumer may be placed: 1. Immediately after a receiver shared by multiple pipelines 2. Immediately before multiple exporters of a single pipeline When data is fanned out _to_ a connector (acting as an exporter), we must ensure that the fanout consumer before exporters (point 2 above) is able to take into account whether or not the connector will be handing the data off to a pipeline that will mutate the data. --- .chloggen/connectors-wrap-mutates.yaml | 16 ++++ service/internal/graph/graph_test.go | 44 +++++++++-- service/internal/graph/nodes.go | 78 ++++++++++++++++--- .../testcomponents/example_connector.go | 2 +- 4 files changed, 119 insertions(+), 21 deletions(-) create mode 100755 .chloggen/connectors-wrap-mutates.yaml diff --git a/.chloggen/connectors-wrap-mutates.yaml b/.chloggen/connectors-wrap-mutates.yaml new file mode 100755 index 00000000000..94d2ddb530d --- /dev/null +++ b/.chloggen/connectors-wrap-mutates.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: connectors + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: When replicating data to connectors, consider whether the next pipeline will mutate data + +# One or more tracking issues or pull requests related to the change +issues: [7776] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/service/internal/graph/graph_test.go b/service/internal/graph/graph_test.go index a4ba37abbee..73076c87449 100644 --- a/service/internal/graph/graph_test.go +++ b/service/internal/graph/graph_test.go @@ -362,7 +362,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { component.NewIDWithName("traces", "in"): { Receivers: []component.ID{component.NewID("examplereceiver")}, Processors: []component.ID{component.NewID("exampleprocessor")}, - Exporters: []component.ID{component.NewID("exampleconnector")}, + Exporters: []component.ID{component.NewID("exampleconnector")}, // wrapped w/ mutates: true }, component.NewIDWithName("traces", "out"): { Receivers: []component.ID{component.NewID("exampleconnector")}, @@ -378,7 +378,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { component.NewIDWithName("metrics", "in"): { Receivers: []component.ID{component.NewID("examplereceiver")}, Processors: []component.ID{component.NewID("exampleprocessor")}, - Exporters: []component.ID{component.NewID("exampleconnector")}, + Exporters: []component.ID{component.NewID("exampleconnector")}, // wrapped w/ mutates: true }, component.NewIDWithName("metrics", "out"): { Receivers: []component.ID{component.NewID("exampleconnector")}, @@ -394,7 +394,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { component.NewIDWithName("logs", "in"): { Receivers: []component.ID{component.NewID("examplereceiver")}, Processors: []component.ID{component.NewID("exampleprocessor")}, - Exporters: []component.ID{component.NewID("exampleconnector")}, + Exporters: []component.ID{component.NewID("exampleconnector")}, // wrapped w/ mutates: true }, component.NewIDWithName("logs", "out"): { Receivers: []component.ID{component.NewID("exampleconnector")}, @@ -410,7 +410,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { component.NewIDWithName("traces", "in"): { Receivers: []component.ID{component.NewID("examplereceiver")}, Processors: []component.ID{component.NewID("exampleprocessor")}, - Exporters: []component.ID{component.NewIDWithName("exampleconnector", "fork")}, + Exporters: []component.ID{component.NewIDWithName("exampleconnector", "fork")}, // wrapped w/ mutates: true }, component.NewIDWithName("traces", "type0"): { Receivers: []component.ID{component.NewIDWithName("exampleconnector", "fork")}, @@ -436,7 +436,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { component.NewIDWithName("metrics", "in"): { Receivers: []component.ID{component.NewID("examplereceiver")}, Processors: []component.ID{component.NewID("exampleprocessor")}, - Exporters: []component.ID{component.NewIDWithName("exampleconnector", "fork")}, + Exporters: []component.ID{component.NewIDWithName("exampleconnector", "fork")}, // wrapped w/ mutates: true }, component.NewIDWithName("metrics", "type0"): { Receivers: []component.ID{component.NewIDWithName("exampleconnector", "fork")}, @@ -462,7 +462,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { component.NewIDWithName("logs", "in"): { Receivers: []component.ID{component.NewID("examplereceiver")}, Processors: []component.ID{component.NewID("exampleprocessor")}, - Exporters: []component.ID{component.NewIDWithName("exampleconnector", "fork")}, + Exporters: []component.ID{component.NewIDWithName("exampleconnector", "fork")}, // wrapped w/ mutates: true }, component.NewIDWithName("logs", "type0"): { Receivers: []component.ID{component.NewIDWithName("exampleconnector", "fork")}, @@ -551,7 +551,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { component.NewIDWithName("traces", "in"): { Receivers: []component.ID{component.NewID("examplereceiver")}, Processors: []component.ID{component.NewID("exampleprocessor")}, - Exporters: []component.ID{component.NewID("exampleconnector")}, + Exporters: []component.ID{component.NewID("exampleconnector")}, // wrapped w/ mutates: true }, component.NewIDWithName("metrics", "in"): { Receivers: []component.ID{component.NewID("examplereceiver")}, @@ -561,7 +561,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { component.NewIDWithName("logs", "in"): { Receivers: []component.ID{component.NewID("examplereceiver")}, Processors: []component.ID{component.NewID("exampleprocessor")}, - Exporters: []component.ID{component.NewID("exampleconnector")}, + Exporters: []component.ID{component.NewID("exampleconnector")}, // wrapped w/ mutates: true }, component.NewIDWithName("traces", "out"): { Receivers: []component.ID{component.NewID("exampleconnector")}, @@ -636,6 +636,8 @@ func TestConnectorPipelinesGraph(t *testing.T) { assert.NoError(t, pg.StartAll(context.Background(), componenttest.NewNopHost())) + mutatingPipelines := make(map[component.ID]bool, len(test.pipelineConfigs)) + // Check each pipeline individually, ensuring that all components are started // and that they have observed no signals yet. for pipelineID, pipelineCfg := range test.pipelineConfigs { @@ -650,6 +652,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { } } assert.Equal(t, expectMutatesData, pipeline.capabilitiesNode.getConsumer().Capabilities().MutatesData) + mutatingPipelines[pipelineID] = expectMutatesData expectedReceivers, expectedExporters := expectedInstances(test.pipelineConfigs, pipelineID) require.Equal(t, expectedReceivers, len(pipeline.receivers)) @@ -703,6 +706,31 @@ func TestConnectorPipelinesGraph(t *testing.T) { } } + // Check that connectors are correctly inheriting mutability from downstream pipelines + for expPipelineID, expPipeline := range pg.pipelines { + for _, exp := range expPipeline.exporters { + expConn, ok := exp.(*connectorNode) + if !ok { + continue + } + // find all the pipelines of the same type where this connector is a receiver + var inheritMutatesData bool + for recPipelineID, recPipeline := range pg.pipelines { + if recPipelineID == expPipelineID || recPipelineID.Type() != expPipelineID.Type() { + continue + } + for _, rec := range recPipeline.receivers { + recConn, ok := rec.(*connectorNode) + if !ok || recConn.ID() != expConn.ID() { + continue + } + inheritMutatesData = inheritMutatesData || mutatingPipelines[recPipelineID] + } + } + assert.Equal(t, inheritMutatesData, expConn.getConsumer().Capabilities().MutatesData) + } + } + // Push data into the pipelines. The list of receivers is retrieved directly from the overall // component graph because we do not want to duplicate signal inputs to receivers that are // shared between pipelines. The `allReceivers` function also excludes connectors, which we do diff --git a/service/internal/graph/nodes.go b/service/internal/graph/nodes.go index 4bb9946e8d0..9892ac6a1b9 100644 --- a/service/internal/graph/nodes.go +++ b/service/internal/graph/nodes.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/service/internal/capabilityconsumer" "go.opentelemetry.io/collector/service/internal/components" "go.opentelemetry.io/collector/service/internal/fanoutconsumer" ) @@ -209,6 +210,7 @@ type connectorNode struct { exprPipelineType component.DataType rcvrPipelineType component.DataType component.Component + baseConsumer } func newConnectorNode(exprPipelineType, rcvrPipelineType component.DataType, connID component.ID) *connectorNode { @@ -221,7 +223,7 @@ func newConnectorNode(exprPipelineType, rcvrPipelineType component.DataType, con } func (n *connectorNode) getConsumer() baseConsumer { - return n.Component.(baseConsumer) + return n.baseConsumer } func (n *connectorNode) buildComponent( @@ -234,61 +236,113 @@ func (n *connectorNode) buildComponent( set := connector.CreateSettings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info} set.TelemetrySettings.Logger = components.ConnectorLogger(set.TelemetrySettings.Logger, n.componentID, n.exprPipelineType, n.rcvrPipelineType) - var err error switch n.rcvrPipelineType { case component.DataTypeTraces: next := nexts[0].(consumer.Traces) + capability := nexts[0].Capabilities() if len(nexts) > 1 { consumers := make(map[component.ID]consumer.Traces, len(nexts)) for _, next := range nexts { consumers[next.(*capabilitiesNode).pipelineID] = next.(consumer.Traces) + capability.MutatesData = capability.MutatesData || next.Capabilities().MutatesData } next = fanoutconsumer.NewTracesRouter(consumers) } + switch n.exprPipelineType { case component.DataTypeTraces: - n.Component, err = builder.CreateTracesToTraces(ctx, set, next) + conn, err := builder.CreateTracesToTraces(ctx, set, next) + if err != nil { + return err + } + n.Component = conn + // When connecting pipelines of the same data type, the connector must + // inherit the capabilities of pipelines in which it is acting as a receiver. + n.baseConsumer = capabilityconsumer.NewTraces(conn, capability) case component.DataTypeMetrics: - n.Component, err = builder.CreateMetricsToTraces(ctx, set, next) + conn, err := builder.CreateMetricsToTraces(ctx, set, next) + if err != nil { + return err + } + n.Component, n.baseConsumer = conn, conn case component.DataTypeLogs: - n.Component, err = builder.CreateLogsToTraces(ctx, set, next) + conn, err := builder.CreateLogsToTraces(ctx, set, next) + if err != nil { + return err + } + n.Component, n.baseConsumer = conn, conn } + case component.DataTypeMetrics: next := nexts[0].(consumer.Metrics) + capability := nexts[0].Capabilities() if len(nexts) > 1 { consumers := make(map[component.ID]consumer.Metrics, len(nexts)) for _, next := range nexts { consumers[next.(*capabilitiesNode).pipelineID] = next.(consumer.Metrics) + capability.MutatesData = capability.MutatesData || next.Capabilities().MutatesData } next = fanoutconsumer.NewMetricsRouter(consumers) } switch n.exprPipelineType { case component.DataTypeTraces: - n.Component, err = builder.CreateTracesToMetrics(ctx, set, next) + conn, err := builder.CreateTracesToMetrics(ctx, set, next) + if err != nil { + return err + } + n.Component, n.baseConsumer = conn, conn case component.DataTypeMetrics: - n.Component, err = builder.CreateMetricsToMetrics(ctx, set, next) + conn, err := builder.CreateMetricsToMetrics(ctx, set, next) + if err != nil { + return err + } + n.Component = conn + // When connecting pipelines of the same data type, the connector must + // inherit the capabilities of pipelines in which it is acting as a receiver. + n.baseConsumer = capabilityconsumer.NewMetrics(conn, capability) case component.DataTypeLogs: - n.Component, err = builder.CreateLogsToMetrics(ctx, set, next) + conn, err := builder.CreateLogsToMetrics(ctx, set, next) + if err != nil { + return err + } + n.Component, n.baseConsumer = conn, conn } case component.DataTypeLogs: next := nexts[0].(consumer.Logs) + capability := nexts[0].Capabilities() if len(nexts) > 1 { consumers := make(map[component.ID]consumer.Logs, len(nexts)) for _, next := range nexts { consumers[next.(*capabilitiesNode).pipelineID] = next.(consumer.Logs) + capability.MutatesData = capability.MutatesData || next.Capabilities().MutatesData } next = fanoutconsumer.NewLogsRouter(consumers) } switch n.exprPipelineType { case component.DataTypeTraces: - n.Component, err = builder.CreateTracesToLogs(ctx, set, next) + conn, err := builder.CreateTracesToLogs(ctx, set, next) + if err != nil { + return err + } + n.Component, n.baseConsumer = conn, conn case component.DataTypeMetrics: - n.Component, err = builder.CreateMetricsToLogs(ctx, set, next) + conn, err := builder.CreateMetricsToLogs(ctx, set, next) + if err != nil { + return err + } + n.Component, n.baseConsumer = conn, conn case component.DataTypeLogs: - n.Component, err = builder.CreateLogsToLogs(ctx, set, next) + conn, err := builder.CreateLogsToLogs(ctx, set, next) + if err != nil { + return err + } + n.Component = conn + // When connecting pipelines of the same data type, the connector must + // inherit the capabilities of pipelines in which it is acting as a receiver. + n.baseConsumer = capabilityconsumer.NewLogs(conn, capability) } } - return err + return nil } var _ consumerNode = &capabilitiesNode{} diff --git a/service/internal/testcomponents/example_connector.go b/service/internal/testcomponents/example_connector.go index 93ee9ace33d..4d1cc5ac6b6 100644 --- a/service/internal/testcomponents/example_connector.go +++ b/service/internal/testcomponents/example_connector.go @@ -113,5 +113,5 @@ type ExampleConnector struct { } func (c *ExampleConnector) Capabilities() consumer.Capabilities { - return consumer.Capabilities{MutatesData: true} + return consumer.Capabilities{MutatesData: false} } From 371fc45171974e23d7a74d42321f8dc36f964a5a Mon Sep 17 00:00:00 2001 From: Gary McDonald Date: Mon, 5 Jun 2023 11:13:02 -0400 Subject: [PATCH 20/21] Fix spelling of transformation in docs/processing.md. (#7815) Signed-off-by: Gary McDonald --- docs/processing.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/processing.md b/docs/processing.md index 2adde5230cc..63e5e21b705 100644 --- a/docs/processing.md +++ b/docs/processing.md @@ -106,7 +106,7 @@ This data can be navigated using field expressions, which are fields within the the status message of a span is `status.message`. A map lookup can include the key as a string, for example `attributes["http.status_code"]`. Operations are scoped to the type of a signal (`span`, `metric`, `log`), with all of the flattened points of that -signal being part of a tranformation space. Virtual fields are added to access data from a higher level before flattening, for +signal being part of a transformation space. Virtual fields are added to access data from a higher level before flattening, for `resource`, `library_info`. For metrics, the structure presented for processing is actual data points, e.g. `NumberDataPoint`, `HistogramDataPoint`, with the information from higher levels like `Metric` or the data type available as virtual fields. @@ -140,7 +140,7 @@ contrib components, and in the future can even allow user plugins possibly throu [HTTP proxies](https://github.com/proxy-wasm/spec). The arguments to operations will primarily be field expressions, allowing the operation to mutate telemetry as needed. -There are times when the tranformation language input and the underlying telemetry model do not translate cleanly. For example, a span ID is represented in pdata as a SpanID struct, but in the tranformation language it is more natural to represent the span ID as a string or a byte array. The solution to this problem is Factories. Factories are functions that help translate between the tranformation language input into the underlying pdata structure. These types of functions do not change the telemetry in any way. Instead, they manipulate the tranformation language input into a form that will make working with the telemetry easier or more efficient. +There are times when the transformation language input and the underlying telemetry model do not translate cleanly. For example, a span ID is represented in pdata as a SpanID struct, but in the transformation language it is more natural to represent the span ID as a string or a byte array. The solution to this problem is Factories. Factories are functions that help translate between the transformation language input into the underlying pdata structure. These types of functions do not change the telemetry in any way. Instead, they manipulate the transformation language input into a form that will make working with the telemetry easier or more efficient. ### Examples @@ -286,7 +286,7 @@ with unknown side effects may cause issues with optimization we will need to exp ## Declarative configuration -The telemetry tranformation language presents an SQL-like experience for defining telemetry transformations - it is made up of +The telemetry transformation language presents an SQL-like experience for defining telemetry transformations - it is made up of the three primary components described above, however, and can be presented declaratively instead depending on what makes sense as a user experience. @@ -305,7 +305,7 @@ sense as a user experience. - attributes["http.request.header.authorization"] ``` -An implementation of the tranformation language would likely parse expressions into this sort of structure so given an SQL-like +An implementation of the transformation language would likely parse expressions into this sort of structure so given an SQL-like implementation, it would likely be little overhead to support a YAML approach in addition. ## Function syntax @@ -355,7 +355,7 @@ the `where ...` clause, as that will be handled by the framework before passing ## Embedded processors -The above describes a tranformation language for configuring processing logic in the OpenTelemetry collector. There will be a +The above describes a transformation language for configuring processing logic in the OpenTelemetry collector. There will be a single processor that exposes the processing logic into the collector config; however, the logic will be implemented within core packages rather than directly inside a processor. This is to ensure that where appropriate, processing can be embedded into other components, for example metric processing is often most appropriate to execute within a @@ -368,4 +368,4 @@ There are some known issues and limitations that we hope to address while iterat - Handling array-typed attributes - Working on a array of points, rather than a single point - Metric alignment - for example defining an expression on two metrics, that may not be at the same timestamp -- The collector has separate pipelines per signal - while the tranformation language could apply cross-signal, we will need to remain single-signal for now +- The collector has separate pipelines per signal - while the transformation language could apply cross-signal, we will need to remain single-signal for now From 2fbdd031c2f521fd674f226eecf9eee82bd317d9 Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 5 Jun 2023 09:27:13 -0700 Subject: [PATCH 21/21] [chore] Prepare release v0.79.0 (#7819) The following commands were run to prepare this release: - make chlog-update VERSION=v0.79.0 - make prepare-release GH=none PREVIOUS_VERSION=0.78.2 RELEASE_CANDIDATE=0.79.0 MODSET=beta --- .../add-connectors-to-components-command.yaml | 16 ---------- .chloggen/connectors-wrap-mutates.yaml | 16 ---------- .chloggen/deprecate-get-exporters.yaml | 16 ---------- .chloggen/msg_enhacement-scrape-on-start.yaml | 19 ----------- .chloggen/sharder.yaml | 11 ------- CHANGELOG.md | 20 ++++++++++++ cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 22 ++++++------- cmd/builder/test/core.builder.yaml | 8 ++--- cmd/otelcorecol/builder-config.yaml | 22 ++++++------- cmd/otelcorecol/go.mod | 32 +++++++++---------- cmd/otelcorecol/main.go | 2 +- component/go.mod | 4 +-- connector/forwardconnector/go.mod | 8 ++--- consumer/go.mod | 2 +- examples/k8s/otel-config.yaml | 4 +-- exporter/go.mod | 10 +++--- exporter/loggingexporter/go.mod | 12 +++---- exporter/otlpexporter/go.mod | 12 +++---- exporter/otlphttpexporter/go.mod | 14 ++++---- extension/ballastextension/go.mod | 6 ++-- extension/zpagesextension/go.mod | 6 ++-- go.mod | 14 ++++---- processor/batchprocessor/go.mod | 12 +++---- processor/memorylimiterprocessor/go.mod | 12 +++---- receiver/go.mod | 10 +++--- receiver/otlpreceiver/go.mod | 14 ++++---- versions.yaml | 2 +- 28 files changed, 135 insertions(+), 193 deletions(-) delete mode 100755 .chloggen/add-connectors-to-components-command.yaml delete mode 100755 .chloggen/connectors-wrap-mutates.yaml delete mode 100755 .chloggen/deprecate-get-exporters.yaml delete mode 100755 .chloggen/msg_enhacement-scrape-on-start.yaml delete mode 100755 .chloggen/sharder.yaml diff --git a/.chloggen/add-connectors-to-components-command.yaml b/.chloggen/add-connectors-to-components-command.yaml deleted file mode 100755 index 6a7d34fca12..00000000000 --- a/.chloggen/add-connectors-to-components-command.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otelcol - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add connectors to output of the `components` command - -# One or more tracking issues or pull requests related to the change -issues: [7809] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: diff --git a/.chloggen/connectors-wrap-mutates.yaml b/.chloggen/connectors-wrap-mutates.yaml deleted file mode 100755 index 94d2ddb530d..00000000000 --- a/.chloggen/connectors-wrap-mutates.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: connectors - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: When replicating data to connectors, consider whether the next pipeline will mutate data - -# One or more tracking issues or pull requests related to the change -issues: [7776] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: diff --git a/.chloggen/deprecate-get-exporters.yaml b/.chloggen/deprecate-get-exporters.yaml deleted file mode 100755 index b26dedd7e7c..00000000000 --- a/.chloggen/deprecate-get-exporters.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecate Host.GetExporters function - -# One or more tracking issues or pull requests related to the change -issues: [7370] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: diff --git a/.chloggen/msg_enhacement-scrape-on-start.yaml b/.chloggen/msg_enhacement-scrape-on-start.yaml deleted file mode 100755 index a41b093543f..00000000000 --- a/.chloggen/msg_enhacement-scrape-on-start.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: scraperhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Will start calling scrapers on component start. - -# One or more tracking issues or pull requests related to the change -issues: [7635] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - The change allows scrapes to perform their initial scrape on component start - and provide an initial delay. This means that scrapes will be delayed by `initial_delay` - before first scrape and then run on `collection_interval` for each consecutive interval. diff --git a/.chloggen/sharder.yaml b/.chloggen/sharder.yaml deleted file mode 100755 index a20fa89d4c4..00000000000 --- a/.chloggen/sharder.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: batchprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Change multiBatcher to use sync.Map, avoid global lock on fast path - -# One or more tracking issues or pull requests related to the change -issues: [7714] diff --git a/CHANGELOG.md b/CHANGELOG.md index a12e2a1de70..f75071867e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,26 @@ +## v0.79.0 + +### 🚩 Deprecations 🚩 + +- `component`: Deprecate Host.GetExporters function (#7370) + +### 💡 Enhancements 💡 + +- `otelcol`: Add connectors to output of the `components` command (#7809) +- `scraperhelper`: Will start calling scrapers on component start. (#7635) + The change allows scrapes to perform their initial scrape on component start + and provide an initial delay. This means that scrapes will be delayed by `initial_delay` + before first scrape and then run on `collection_interval` for each consecutive interval. + +- `batchprocessor`: Change multiBatcher to use sync.Map, avoid global lock on fast path (#7714) + +### 🧰 Bug fixes 🧰 + +- `connectors`: When replicating data to connectors, consider whether the next pipeline will mutate data (#7776) + ## v0.78.2 ### 🧰 Bug fixes 🧰 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index b1dafd389ba..01438c34070 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -15,7 +15,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.78.2" +const defaultOtelColVersion = "0.79.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 4c7811e45f0..ffa0598f7bf 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,21 +2,21 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.78.2-dev - otelcol_version: 0.78.2 + version: 0.79.0-dev + otelcol_version: 0.79.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.2 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.79.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.78.2 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.78.2 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.78.2 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.79.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.79.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.79.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.78.2 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.78.2 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.79.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.79.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.78.2 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.2 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.79.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.79.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.78.2 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.79.0 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index f70a1b9c146..d65ea394031 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.78.2 + otelcol_version: 0.79.0 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.78.2 + gomod: go.opentelemetry.io/collector v0.79.0 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.78.2 + gomod: go.opentelemetry.io/collector v0.79.0 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.78.2 + gomod: go.opentelemetry.io/collector v0.79.0 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index f98dbea695c..1ef43288f9f 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,23 +2,23 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.78.2-dev - otelcol_version: 0.78.2 + version: 0.79.0-dev + otelcol_version: 0.79.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.2 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.79.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.78.2 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.78.2 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.78.2 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.79.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.79.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.79.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.78.2 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.78.2 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.79.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.79.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.78.2 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.2 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.79.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.79.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.78.2 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.79.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 480e8ac294f..39fdce3efce 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,19 +6,19 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/connector/forwardconnector v0.78.2 - go.opentelemetry.io/collector/exporter v0.78.2 - go.opentelemetry.io/collector/exporter/loggingexporter v0.78.2 - go.opentelemetry.io/collector/exporter/otlpexporter v0.78.2 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.78.2 - go.opentelemetry.io/collector/extension/ballastextension v0.78.2 - go.opentelemetry.io/collector/extension/zpagesextension v0.78.2 - go.opentelemetry.io/collector/processor/batchprocessor v0.78.2 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.2 - go.opentelemetry.io/collector/receiver v0.78.2 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.79.0 + go.opentelemetry.io/collector/exporter v0.79.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.79.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.79.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.79.0 + go.opentelemetry.io/collector/extension/ballastextension v0.79.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.79.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.79.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.79.0 + go.opentelemetry.io/collector/receiver v0.79.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.79.0 golang.org/x/sys v0.8.0 ) @@ -68,11 +68,11 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.78.2 // indirect - go.opentelemetry.io/collector/consumer v0.78.2 // indirect + go.opentelemetry.io/collector/confmap v0.79.0 // indirect + go.opentelemetry.io/collector/consumer v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/semconv v0.78.2 // indirect + go.opentelemetry.io/collector/semconv v0.79.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 80721ce7cd3..3813972f2c7 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -19,7 +19,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.78.2-dev", + Version: "0.79.0-dev", } if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil { diff --git a/component/go.mod b/component/go.mod index 7ccadd1033f..c94b5fcc288 100644 --- a/component/go.mod +++ b/component/go.mod @@ -4,8 +4,8 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel/metric v1.16.0 go.opentelemetry.io/otel/trace v1.16.0 diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 8f49e09eb36..e58012eafe0 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 ) @@ -22,7 +22,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.78.2 // indirect + go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel v1.16.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index 31ed689eb6f..591fc467212 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 + go.opentelemetry.io/collector v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 ) diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index de66944e2bc..61473861850 100644 --- a/examples/k8s/otel-config.yaml +++ b/examples/k8s/otel-config.yaml @@ -68,7 +68,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-agent-config.yaml" - image: otel/opentelemetry-collector:0.78.2 + image: otel/opentelemetry-collector:0.79.0 name: otel-agent resources: limits: @@ -187,7 +187,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.78.2 + image: otel/opentelemetry-collector:0.79.0 name: otel-collector resources: limits: diff --git a/exporter/go.mod b/exporter/go.mod index 31b9c6cb76c..82a617cdd36 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,9 +6,9 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/sdk v1.16.0 @@ -42,9 +42,9 @@ require ( github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.78.2 // indirect + go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.2 // indirect + go.opentelemetry.io/collector/receiver v0.79.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index c49fd03af7f..9c3b4bd5789 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -4,11 +4,11 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 - go.opentelemetry.io/collector/exporter v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 + go.opentelemetry.io/collector/exporter v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.uber.org/zap v1.24.0 golang.org/x/sys v0.8.0 @@ -30,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.2 // indirect + go.opentelemetry.io/collector/receiver v0.79.0 // indirect go.opentelemetry.io/otel v1.16.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index ce1ffca947c..3a9fac52f20 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,11 +4,11 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 - go.opentelemetry.io/collector/exporter v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 + go.opentelemetry.io/collector/exporter v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 google.golang.org/grpc v1.55.0 @@ -36,7 +36,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.2 // indirect + go.opentelemetry.io/collector/receiver v0.79.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect go.opentelemetry.io/otel v1.16.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 6b541f890ad..73e018066db 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,14 +4,14 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 - go.opentelemetry.io/collector/exporter v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 + go.opentelemetry.io/collector/exporter v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/collector/receiver v0.78.2 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.78.2 + go.opentelemetry.io/collector/receiver v0.79.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.79.0 go.uber.org/zap v1.24.0 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 google.golang.org/grpc v1.55.0 diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index ef9d8a859ec..d7ca81542f3 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 go.uber.org/zap v1.24.0 ) diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 3be2a968b8b..6f9701b6211 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 go.opentelemetry.io/contrib/zpages v0.42.0 go.opentelemetry.io/otel/sdk v1.16.0 go.opentelemetry.io/otel/trace v1.16.0 diff --git a/go.mod b/go.mod index 05eb7a9a396..18983ef978e 100644 --- a/go.mod +++ b/go.mod @@ -17,15 +17,15 @@ require ( github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 - go.opentelemetry.io/collector/exporter v0.78.2 - go.opentelemetry.io/collector/extension/zpagesextension v0.78.2 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 + go.opentelemetry.io/collector/exporter v0.79.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.79.0 go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/collector/receiver v0.78.2 - go.opentelemetry.io/collector/semconv v0.78.2 + go.opentelemetry.io/collector/receiver v0.79.0 + go.opentelemetry.io/collector/semconv v0.79.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 go.opentelemetry.io/contrib/propagators/b3 v1.17.0 diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 5217fdb7ec9..a97b54420d8 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -9,10 +9,10 @@ require ( github.com/prometheus/common v0.44.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/exporters/prometheus v0.39.0 @@ -44,9 +44,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/exporter v0.78.2 // indirect + go.opentelemetry.io/collector/exporter v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.2 // indirect + go.opentelemetry.io/collector/receiver v0.79.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index ac0f487fb6f..5562bd9f823 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,10 +4,10 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.uber.org/zap v1.24.0 ) @@ -32,9 +32,9 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/exporter v0.78.2 // indirect + go.opentelemetry.io/collector/exporter v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect - go.opentelemetry.io/collector/receiver v0.78.2 // indirect + go.opentelemetry.io/collector/receiver v0.79.0 // indirect go.opentelemetry.io/otel v1.16.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect diff --git a/receiver/go.mod b/receiver/go.mod index bd05471986e..e619caf292f 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/sdk v1.16.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.78.2 // indirect - go.opentelemetry.io/collector/exporter v0.78.2 // indirect + go.opentelemetry.io/collector/confmap v0.79.0 // indirect + go.opentelemetry.io/collector/exporter v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index c7bf35e1c6d..4cd125c6891 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -5,13 +5,13 @@ go 1.19 require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.78.2 - go.opentelemetry.io/collector/component v0.78.2 - go.opentelemetry.io/collector/confmap v0.78.2 - go.opentelemetry.io/collector/consumer v0.78.2 + go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/confmap v0.79.0 + go.opentelemetry.io/collector/consumer v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 - go.opentelemetry.io/collector/receiver v0.78.2 - go.opentelemetry.io/collector/semconv v0.78.2 + go.opentelemetry.io/collector/receiver v0.79.0 + go.opentelemetry.io/collector/semconv v0.79.0 go.uber.org/zap v1.24.0 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 google.golang.org/grpc v1.55.0 @@ -50,7 +50,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/exporter v0.78.2 // indirect + go.opentelemetry.io/collector/exporter v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect diff --git a/versions.yaml b/versions.yaml index 2d1626143fb..f148cb4ccbc 100644 --- a/versions.yaml +++ b/versions.yaml @@ -8,7 +8,7 @@ module-sets: - go.opentelemetry.io/collector/featuregate - go.opentelemetry.io/collector/pdata beta: - version: v0.78.2 + version: v0.79.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/component