Skip to content

Commit

Permalink
[chore] update test for confmap changes (open-telemetry#32660)
Browse files Browse the repository at this point in the history 
**Description:**
Update test to be compatible with confmap changes to unmarshal via
confmap first

---------

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>
  • Loading branch information
@atoulme
atoulme committed May 24, 2024
1 parent a603781 commit ecbd48f
Show file tree
Hide file tree
Showing 516 changed files with 16,455 additions and 16,537 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-and-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ jobs:
- name: Gen genotelcontribcol
run: |
make genotelcontribcol
git diff
git diff -s --exit-code || (echo 'Generated code is out of date, please run "make genotelcontribcol" and commit the changes in this PR.' && exit 1)
- name: Gen genoteltestbedcol
run: |
Expand Down
110 changes: 55 additions & 55 deletions cmd/configschema/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.101.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.101.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.101.0
go.opentelemetry.io/collector/config/configtls v0.101.0
go.opentelemetry.io/collector/otelcol v0.101.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0
go.opentelemetry.io/collector/component v0.101.1-0.20240523155058-812210ba3685
go.opentelemetry.io/collector/config/configtls v0.101.1-0.20240523155058-812210ba3685
go.opentelemetry.io/collector/otelcol v0.101.1-0.20240523155058-812210ba3685
go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.1-0.20240523155058-812210ba3685
go.uber.org/goleak v1.3.0
golang.org/x/mod v0.17.0
golang.org/x/text v0.15.0
Expand Down Expand Up @@ -169,8 +169,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.101.0 // indirect
github.com/samber/lo v1.38.1 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
go.opentelemetry.io/collector/exporter v0.101.0 // indirect
go.opentelemetry.io/collector/receiver v0.101.0 // indirect
go.opentelemetry.io/collector/exporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/receiver v0.101.1-0.20240523155058-812210ba3685 // indirect
)

require (
Expand Down Expand Up @@ -685,61 +685,61 @@ require (
go.mongodb.org/atlas v0.36.0 // indirect
go.mongodb.org/mongo-driver v1.15.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.101.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.101.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.8.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.101.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.101.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.101.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.8.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.101.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect
go.opentelemetry.io/collector/config/internal v0.101.0 // indirect
go.opentelemetry.io/collector/confmap v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.101.0 // indirect
go.opentelemetry.io/collector/connector v0.101.0 // indirect
go.opentelemetry.io/collector/connector/forwardconnector v0.101.0 // indirect
go.opentelemetry.io/collector/consumer v0.101.0 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.101.0 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.101.0 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.101.0 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.0 // indirect
go.opentelemetry.io/collector/extension v0.101.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.101.0 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.101.0 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.101.0 // indirect
go.opentelemetry.io/collector/featuregate v1.8.0 // indirect
go.opentelemetry.io/collector/filter v0.101.0 // indirect
go.opentelemetry.io/collector/pdata v1.8.0 // indirect
go.opentelemetry.io/collector/processor v0.101.0 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.101.0 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.101.0 // indirect
go.opentelemetry.io/collector/semconv v0.101.0 // indirect
go.opentelemetry.io/collector/service v0.101.0 // indirect
go.opentelemetry.io/collector v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/configauth v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/configcompression v1.8.1-0.20240523143024-6f5d43f9e405 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/confighttp v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/confignet v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/configopaque v1.8.1-0.20240523143024-6f5d43f9e405 // indirect
go.opentelemetry.io/collector/config/configretry v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/internal v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/connector v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/connector/forwardconnector v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/consumer v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/extension v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/extension/auth v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/featuregate v1.8.1-0.20240523143024-6f5d43f9e405 // indirect
go.opentelemetry.io/collector/filter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/pdata v1.8.1-0.20240523143024-6f5d43f9e405 // indirect
go.opentelemetry.io/collector/processor v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/semconv v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/service v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/contrib/config v0.6.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.26.0 // indirect
go.opentelemetry.io/contrib/zpages v0.51.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.26.0 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/dig v1.17.0 // indirect
Expand All @@ -758,9 +758,9 @@ require (
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/api v0.181.0 // indirect
google.golang.org/genproto v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/genproto v0.0.0-20240521202816-d264139d666e // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down

0 comments on commit ecbd48f

Please sign in to comment.