Skip to content

Commit 1d12566

Browse files
codebotencodeboten
authored
[chore] update core dep (#33417)
This brings in the rename of CreateSettings -> Settings and NewNopCreateSettings -> NewNopSettings --------- Signed-off-by: Alex Boten <[email protected]>
1 parent f53454c commit 1d12566

File tree

1,710 files changed

+14340
-15029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,710 files changed

+14340
-15029
lines changed

‎cmd/githubgen/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.21.0
44

55
require (
66
github.com/google/go-github/v62 v62.0.0
7-
go.opentelemetry.io/collector/confmap v0.102.1
8-
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1
7+
go.opentelemetry.io/collector/confmap v0.102.2-0.20240606174409-6888f8f7a45f
8+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.2-0.20240606174409-6888f8f7a45f
99
gopkg.in/yaml.v3 v3.0.1
1010
)
1111

‎cmd/githubgen/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/opampsupervisor/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ require (
1111
github.com/knadh/koanf/v2 v2.1.1
1212
github.com/open-telemetry/opamp-go v0.15.0
1313
github.com/stretchr/testify v1.9.0
14-
go.opentelemetry.io/collector/config/configopaque v1.9.1-0.20240605145924-86ee482e5b49
15-
go.opentelemetry.io/collector/config/configtls v0.102.1
16-
go.opentelemetry.io/collector/semconv v0.102.1
14+
go.opentelemetry.io/collector/config/configopaque v1.9.1-0.20240606174409-6888f8f7a45f
15+
go.opentelemetry.io/collector/config/configtls v0.102.2-0.20240606174409-6888f8f7a45f
16+
go.opentelemetry.io/collector/semconv v0.102.2-0.20240606174409-6888f8f7a45f
1717
go.uber.org/goleak v1.3.0
1818
go.uber.org/zap v1.27.0
1919
google.golang.org/protobuf v1.34.1

‎cmd/opampsupervisor/go.sum

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcontribcol/builder-config.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ dist:
1414
otelcol_version: 0.102.1
1515

1616
extensions:
17-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.1
18-
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.1
17+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.2-0.20240606174409-6888f8f7a45f
18+
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.2-0.20240606174409-6888f8f7a45f
1919
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.102.0
2020
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.102.0
2121
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.102.0
@@ -52,10 +52,10 @@ extensions:
5252
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension
5353

5454
exporters:
55-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.1
56-
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.1
57-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1
58-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1
55+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.2-0.20240606174409-6888f8f7a45f
56+
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.2-0.20240606174409-6888f8f7a45f
57+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.2-0.20240606174409-6888f8f7a45f
58+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.2-0.20240606174409-6888f8f7a45f
5959
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.102.0
6060
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.102.0
6161
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.102.0
@@ -101,8 +101,8 @@ exporters:
101101
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.102.0
102102

103103
processors:
104-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.1
105-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.1
104+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.2-0.20240606174409-6888f8f7a45f
105+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.2-0.20240606174409-6888f8f7a45f
106106
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.102.0
107107
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.102.0
108108
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.102.0
@@ -125,8 +125,8 @@ processors:
125125
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.102.0
126126

127127
receivers:
128-
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.1
129-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1
128+
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.2-0.20240606174409-6888f8f7a45f
129+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.2-0.20240606174409-6888f8f7a45f
130130
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.102.0
131131
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.102.0
132132
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.102.0
@@ -216,7 +216,7 @@ receivers:
216216
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.102.0
217217

218218
connectors:
219-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.1
219+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.2-0.20240606174409-6888f8f7a45f
220220
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.102.0
221221
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.102.0
222222
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.102.0
@@ -228,11 +228,11 @@ connectors:
228228
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.102.0
229229

230230
providers:
231-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1
232-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1
233-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1
234-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1
235-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1
231+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.2-0.20240606174409-6888f8f7a45f
232+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.2-0.20240606174409-6888f8f7a45f
233+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.2-0.20240606174409-6888f8f7a45f
234+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.2-0.20240606174409-6888f8f7a45f
235+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.2-0.20240606174409-6888f8f7a45f
236236
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.102.0
237237
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.102.0
238238

‎cmd/otelcontribcol/exporters_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ type getExporterConfigFn func() component.Config
592592
func verifyExporterLifecycle(t *testing.T, factory exporter.Factory, getConfigFn getExporterConfigFn, expectErr bool) {
593593
ctx := context.Background()
594594
host := newAssertNoErrorHost(t)
595-
expCreateSettings := exportertest.NewNopCreateSettings()
595+
expCreateSettings := exportertest.NewNopSettings()
596596

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

691691
if getConfigFn == nil {
692692
getConfigFn = factory.CreateDefaultConfig
@@ -714,24 +714,24 @@ func verifyExporterShutdown(tb testing.TB, factory exporter.Factory, getConfigFn
714714

715715
type createExporterFn func(
716716
ctx context.Context,
717-
set exporter.CreateSettings,
717+
set exporter.Settings,
718718
cfg component.Config,
719719
) (component.Component, error)
720720

721721
func wrapCreateLogsExp(factory exporter.Factory) createExporterFn {
722-
return func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) {
722+
return func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) {
723723
return factory.CreateLogsExporter(ctx, set, cfg)
724724
}
725725
}
726726

727727
func wrapCreateTracesExp(factory exporter.Factory) createExporterFn {
728-
return func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) {
728+
return func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) {
729729
return factory.CreateTracesExporter(ctx, set, cfg)
730730
}
731731
}
732732

733733
func wrapCreateMetricsExp(factory exporter.Factory) createExporterFn {
734-
return func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) {
734+
return func(ctx context.Context, set exporter.Settings, cfg component.Config) (component.Component, error) {
735735
return factory.CreateMetricsExporter(ctx, set, cfg)
736736
}
737737
}

‎cmd/otelcontribcol/extensions_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ type getExtensionConfigFn func() component.Config
317317
func verifyExtensionLifecycle(t *testing.T, factory extension.Factory, getConfigFn getExtensionConfigFn) {
318318
ctx := context.Background()
319319
host := componenttest.NewNopHost()
320-
extCreateSet := extensiontest.NewNopCreateSettings()
320+
extCreateSet := extensiontest.NewNopSettings()
321321
extCreateSet.ReportStatus = func(event *component.StatusEvent) {
322322
require.NoError(t, event.Err())
323323
}
@@ -340,7 +340,7 @@ func verifyExtensionLifecycle(t *testing.T, factory extension.Factory, getConfig
340340
// verifyExtensionShutdown is used to test if an extension type can be shutdown without being started first.
341341
func verifyExtensionShutdown(tb testing.TB, factory extension.Factory, getConfigFn getExtensionConfigFn) {
342342
ctx := context.Background()
343-
extCreateSet := extensiontest.NewNopCreateSettings()
343+
extCreateSet := extensiontest.NewNopSettings()
344344

345345
if getConfigFn == nil {
346346
getConfigFn = factory.CreateDefaultConfig

0 commit comments

Comments
 (0)