Skip to content

Commit

Permalink
Merge release/v0.106.x to main (with fixing merge conflicts) (#10757)
Browse files Browse the repository at this point in the history
  • Loading branch information
@codeboten
codeboten authored Jul 30, 2024
2 parents b81b76b + 25b9302 commit 7f9341e
Show file tree
Hide file tree
Showing 55 changed files with 484 additions and 484 deletions.
2 changes: 1 addition & 1 deletion client/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21.0

require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/consumer v0.106.0
go.opentelemetry.io/collector/consumer v0.106.1
go.opentelemetry.io/collector/pdata v1.12.0
go.uber.org/goleak v1.3.0
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/internal/builder/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"go.uber.org/zap"
)

const defaultOtelColVersion = "0.106.0"
const defaultOtelColVersion = "0.106.1"

// ErrMissingGoMod indicates an empty gomod field
var ErrMissingGoMod = errors.New("missing gomod specification for module")
Expand Down
40 changes: 20 additions & 20 deletions cmd/builder/internal/config/default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,32 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.106.0-dev
otelcol_version: 0.106.0
version: 0.106.1-dev
otelcol_version: 0.106.1

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.106.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.0
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.106.1
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1
exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.1
extensions:
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.106.0
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.106.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.106.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.106.1
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.106.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.106.1
processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.106.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.106.1
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.1
connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.106.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.106.1

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.1

8 changes: 4 additions & 4 deletions cmd/builder/test/core.builder.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
dist:
module: go.opentelemetry.io/collector/builder/test/core
otelcol_version: 0.106.0
otelcol_version: 0.106.1

extensions:
- import: go.opentelemetry.io/collector/extension/zpagesextension
gomod: go.opentelemetry.io/collector v0.106.0
gomod: go.opentelemetry.io/collector v0.106.1
path: ${WORKSPACE_DIR}

receivers:
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
gomod: go.opentelemetry.io/collector v0.106.0
gomod: go.opentelemetry.io/collector v0.106.1
path: ${WORKSPACE_DIR}

exporters:
- import: go.opentelemetry.io/collector/exporter/debugexporter
gomod: go.opentelemetry.io/collector v0.106.0
gomod: go.opentelemetry.io/collector v0.106.1
path: ${WORKSPACE_DIR}

replaces:
Expand Down
24 changes: 12 additions & 12 deletions cmd/mdatagen/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ go 1.21.0
require (
github.com/google/go-cmp v0.6.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.106.0
go.opentelemetry.io/collector/config/configtelemetry v0.106.0
go.opentelemetry.io/collector/confmap v0.106.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.0
go.opentelemetry.io/collector/consumer v0.106.0
go.opentelemetry.io/collector/consumer/consumertest v0.106.0
go.opentelemetry.io/collector/filter v0.106.0
go.opentelemetry.io/collector/component v0.106.1
go.opentelemetry.io/collector/config/configtelemetry v0.106.1
go.opentelemetry.io/collector/confmap v0.106.1
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1
go.opentelemetry.io/collector/consumer v0.106.1
go.opentelemetry.io/collector/consumer/consumertest v0.106.1
go.opentelemetry.io/collector/filter v0.106.1
go.opentelemetry.io/collector/pdata v1.12.0
go.opentelemetry.io/collector/receiver v0.106.0
go.opentelemetry.io/collector/semconv v0.106.0
go.opentelemetry.io/collector/receiver v0.106.1
go.opentelemetry.io/collector/semconv v0.106.1
go.opentelemetry.io/otel/metric v1.28.0
go.opentelemetry.io/otel/sdk/metric v1.28.0
go.opentelemetry.io/otel/trace v1.28.0
Expand Down Expand Up @@ -47,10 +47,10 @@ require (
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1 // indirect
go.opentelemetry.io/collector/featuregate v1.12.0 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.106.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.106.0 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.106.1 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
Expand Down
40 changes: 20 additions & 20 deletions cmd/otelcorecol/builder-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.106.0-dev
otelcol_version: 0.106.0
version: 0.106.1-dev
otelcol_version: 0.106.1

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.106.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.0
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.106.1
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1
exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.1
extensions:
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.106.0
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.106.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.106.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.106.1
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.106.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.106.1
processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.106.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.106.1
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.1
connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.106.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.106.1

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.1

replaces:
- go.opentelemetry.io/collector => ../../
Expand Down
26 changes: 13 additions & 13 deletions cmd/otelcorecol/components.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7f9341e

Please sign in to comment.