Skip to content

Commit

Permalink
[chore] update core dep (open-telemetry#33417)
Browse files Browse the repository at this point in the history
This brings in the rename of CreateSettings -> Settings and
NewNopCreateSettings -> NewNopSettings

---------

Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
codeboten committed Jun 7, 2024
1 parent f53454c commit 1d12566
Show file tree
Hide file tree
Showing 1,710 changed files with 14,340 additions and 15,029 deletions.
4 changes: 2 additions & 2 deletions cmd/githubgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.21.0

require (
github.com/google/go-github/v62 v62.0.0
go.opentelemetry.io/collector/confmap v0.102.1
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1
go.opentelemetry.io/collector/confmap v0.102.2-0.20240606174409-6888f8f7a45f
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.2-0.20240606174409-6888f8f7a45f
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/githubgen/go.sum

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

6 changes: 3 additions & 3 deletions cmd/opampsupervisor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ require (
github.com/knadh/koanf/v2 v2.1.1
github.com/open-telemetry/opamp-go v0.15.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/config/configopaque v1.9.1-0.20240605145924-86ee482e5b49
go.opentelemetry.io/collector/config/configtls v0.102.1
go.opentelemetry.io/collector/semconv v0.102.1
go.opentelemetry.io/collector/config/configopaque v1.9.1-0.20240606174409-6888f8f7a45f
go.opentelemetry.io/collector/config/configtls v0.102.2-0.20240606174409-6888f8f7a45f
go.opentelemetry.io/collector/semconv v0.102.2-0.20240606174409-6888f8f7a45f
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
google.golang.org/protobuf v1.34.1
Expand Down
12 changes: 6 additions & 6 deletions cmd/opampsupervisor/go.sum

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

32 changes: 16 additions & 16 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dist:
otelcol_version: 0.102.1

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.1
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.102.0
Expand Down Expand Up @@ -52,10 +52,10 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.1
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.1
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.102.0
Expand Down Expand Up @@ -101,8 +101,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.102.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.1
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.1
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.102.0
Expand All @@ -125,8 +125,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.102.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.1
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.102.0
Expand Down Expand Up @@ -216,7 +216,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.102.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.1
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.102.0
Expand All @@ -228,11 +228,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.102.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.2-0.20240606174409-6888f8f7a45f
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.102.0

Expand Down
12 changes: 6 additions & 6 deletions cmd/otelcontribcol/exporters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ type getExporterConfigFn func() component.Config
func verifyExporterLifecycle(t *testing.T, factory exporter.Factory, getConfigFn getExporterConfigFn, expectErr bool) {
ctx := context.Background()
host := newAssertNoErrorHost(t)
expCreateSettings := exportertest.NewNopCreateSettings()
expCreateSettings := exportertest.NewNopSettings()

cfg := factory.CreateDefaultConfig()
if getConfigFn != nil {
Expand Down Expand Up @@ -686,7 +686,7 @@ func generateTestTraces() ptrace.Traces {
// verifyExporterShutdown is used to test if an exporter type can be shutdown without being started first.
func verifyExporterShutdown(tb testing.TB, factory exporter.Factory, getConfigFn getExporterConfigFn) {
ctx := context.Background()
expCreateSettings := exportertest.NewNopCreateSettings()
expCreateSettings := exportertest.NewNopSettings()

if getConfigFn == nil {
getConfigFn = factory.CreateDefaultConfig
Expand Down Expand Up @@ -714,24 +714,24 @@ func verifyExporterShutdown(tb testing.TB, factory exporter.Factory, getConfigFn

type createExporterFn func(
ctx context.Context,
set exporter.CreateSettings,
set exporter.Settings,
cfg component.Config,
) (component.Component, error)

func wrapCreateLogsExp(factory exporter.Factory) createExporterFn {
return func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) {
return func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) {
return factory.CreateLogsExporter(ctx, set, cfg)
}
}

func wrapCreateTracesExp(factory exporter.Factory) createExporterFn {
return func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) {
return func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) {
return factory.CreateTracesExporter(ctx, set, cfg)
}
}

func wrapCreateMetricsExp(factory exporter.Factory) createExporterFn {
return func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) {
return func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) {
return factory.CreateMetricsExporter(ctx, set, cfg)
}
}
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/extensions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ type getExtensionConfigFn func() component.Config
func verifyExtensionLifecycle(t *testing.T, factory extension.Factory, getConfigFn getExtensionConfigFn) {
ctx := context.Background()
host := componenttest.NewNopHost()
extCreateSet := extensiontest.NewNopCreateSettings()
extCreateSet := extensiontest.NewNopSettings()
extCreateSet.ReportStatus = func(event *component.StatusEvent) {
require.NoError(t, event.Err())
}
Expand All @@ -340,7 +340,7 @@ func verifyExtensionLifecycle(t *testing.T, factory extension.Factory, getConfig
// verifyExtensionShutdown is used to test if an extension type can be shutdown without being started first.
func verifyExtensionShutdown(tb testing.TB, factory extension.Factory, getConfigFn getExtensionConfigFn) {
ctx := context.Background()
extCreateSet := extensiontest.NewNopCreateSettings()
extCreateSet := extensiontest.NewNopSettings()

if getConfigFn == nil {
getConfigFn = factory.CreateDefaultConfig
Expand Down
Loading

0 comments on commit 1d12566

Please sign in to comment.