Skip to content

Commit

Permalink
Merge branch 'main' into debugexporter-add-profiles
Browse files Browse the repository at this point in the history
  • Loading branch information
julianocosta89 authored Oct 23, 2024
2 parents 46c1556 + 2418583 commit dcb8b7b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions confmap/internal/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.22.0

require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/config/configopaque v1.17.0
go.opentelemetry.io/collector/config/configopaque v1.18.0
go.opentelemetry.io/collector/confmap v1.18.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.17.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.17.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0
)

require (
Expand Down
8 changes: 4 additions & 4 deletions internal/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ require (
go.opentelemetry.io/collector/consumer/consumertest v0.112.0
go.opentelemetry.io/collector/exporter v0.112.0
go.opentelemetry.io/collector/exporter/exportertest v0.112.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.111.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.111.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.112.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.112.0
go.opentelemetry.io/collector/extension v0.112.0
go.opentelemetry.io/collector/pdata v1.18.0
go.opentelemetry.io/collector/pdata/testdata v0.112.0
go.opentelemetry.io/collector/pipeline v0.112.0
go.opentelemetry.io/collector/receiver v0.112.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.111.0
go.opentelemetry.io/collector/service v0.111.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.112.0
go.opentelemetry.io/collector/service v0.112.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
)
Expand Down

0 comments on commit dcb8b7b

Please sign in to comment.