Skip to content

Commit df8c2ad

Browse files
yurishkuroyurishkuro
committed
Revert "fix(deps): update all otel collector packages (jaegertracing#6112)"
This reverts commit 37d1fc1.
1 parent 483e149 commit df8c2ad

File tree

12 files changed

+217
-227
lines changed

12 files changed

+217
-227
lines changed

‎cmd/jaeger/internal/components.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"go.opentelemetry.io/collector/exporter/otlpexporter"
2222
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
2323
"go.opentelemetry.io/collector/extension"
24+
"go.opentelemetry.io/collector/extension/ballastextension"
2425
"go.opentelemetry.io/collector/extension/zpagesextension"
2526
"go.opentelemetry.io/collector/otelcol"
2627
"go.opentelemetry.io/collector/processor"
@@ -62,6 +63,7 @@ func (b builders) build() (otelcol.Factories, error) {
6263

6364
factories.Extensions, err = b.extension(
6465
// standard
66+
ballastextension.NewFactory(),
6567
zpagesextension.NewFactory(),
6668
healthcheckv2extension.NewFactory(),
6769
// add-ons

‎cmd/jaeger/internal/exporters/storageexporter/exporter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func TestExporter(t *testing.T) {
119119
err := config.Validate()
120120
require.NoError(t, err)
121121

122-
tracesExporter, err := exporterFactory.CreateTraces(ctx, exporter.Settings{
122+
tracesExporter, err := exporterFactory.CreateTracesExporter(ctx, exporter.Settings{
123123
ID: ID,
124124
TelemetrySettings: telemetrySettings,
125125
BuildInfo: component.NewDefaultBuildInfo(),
@@ -172,7 +172,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
172172
MeterProvider: noopmetric.NewMeterProvider(),
173173
}
174174
extensionFactory := jaegerstorage.NewFactory()
175-
storageExtension, err := extensionFactory.Create(
175+
storageExtension, err := extensionFactory.CreateExtension(
176176
context.Background(),
177177
extension.Settings{
178178
TelemetrySettings: telemetrySettings,

‎cmd/jaeger/internal/exporters/storageexporter/factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func createDefaultConfig() component.Config {
3535
func createTracesExporter(ctx context.Context, set exporter.Settings, config component.Config) (exporter.Traces, error) {
3636
cfg := config.(*Config)
3737
ex := newExporter(cfg, set.TelemetrySettings)
38-
return exporterhelper.NewTraces(ctx, set, cfg,
38+
return exporterhelper.NewTracesExporter(ctx, set, cfg,
3939
ex.pushTraces,
4040
exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
4141
// Disable Timeout/RetryOnFailure

‎cmd/jaeger/internal/extension/expvar/factory_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestCreateDefaultConfig(t *testing.T) {
2222
func TestCreateExtension(t *testing.T) {
2323
cfg := createDefaultConfig().(*Config)
2424
f := NewFactory()
25-
r, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
25+
r, err := f.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
2626
require.NoError(t, err)
2727
assert.NotNil(t, r)
2828
}

‎cmd/jaeger/internal/extension/jaegerstorage/extension_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func noopTelemetrySettings() component.TelemetrySettings {
266266
func makeStorageExtenion(t *testing.T, config *Config) component.Component {
267267
extensionFactory := NewFactory()
268268
ctx := context.Background()
269-
ext, err := extensionFactory.Create(ctx,
269+
ext, err := extensionFactory.CreateExtension(ctx,
270270
extension.Settings{
271271
ID: ID,
272272
TelemetrySettings: noopTelemetrySettings(),

‎cmd/jaeger/internal/extension/remotesampling/extension_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
4545
MeterProvider: noopmetric.NewMeterProvider(),
4646
}
4747
extensionFactory := jaegerstorage.NewFactory()
48-
storageExtension, err := extensionFactory.Create(
48+
storageExtension, err := extensionFactory.CreateExtension(
4949
context.Background(),
5050
extension.Settings{
5151
TelemetrySettings: telemetrySettings,
@@ -67,7 +67,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
6767

6868
func makeRemoteSamplingExtension(t *testing.T, cfg component.Config) component.Host {
6969
extensionFactory := NewFactory()
70-
samplingExtension, err := extensionFactory.Create(
70+
samplingExtension, err := extensionFactory.CreateExtension(
7171
context.Background(),
7272
extension.Settings{
7373
TelemetrySettings: component.TelemetrySettings{
@@ -95,7 +95,7 @@ func TestStartFileBasedProvider(t *testing.T) {
9595
cfg.GRPC = nil
9696
require.NoError(t, cfg.Validate())
9797

98-
ext, err := factory.Create(context.Background(), extension.Settings{
98+
ext, err := factory.CreateExtension(context.Background(), extension.Settings{
9999
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
100100
}, cfg)
101101
require.NoError(t, err)
@@ -115,7 +115,7 @@ func TestStartHTTP(t *testing.T) {
115115
cfg.GRPC = nil
116116
require.NoError(t, cfg.Validate())
117117

118-
ext, err := factory.Create(context.Background(), extension.Settings{
118+
ext, err := factory.CreateExtension(context.Background(), extension.Settings{
119119
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
120120
}, cfg)
121121
require.NoError(t, err)
@@ -155,7 +155,7 @@ func TestStartGRPC(t *testing.T) {
155155
}
156156
require.NoError(t, cfg.Validate())
157157

158-
ext, err := factory.Create(context.Background(), extension.Settings{
158+
ext, err := factory.CreateExtension(context.Background(), extension.Settings{
159159
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
160160
}, cfg)
161161
require.NoError(t, err)
@@ -183,7 +183,7 @@ func TestStartAdaptiveProvider(t *testing.T) {
183183
cfg.GRPC = nil
184184
require.NoError(t, cfg.Validate())
185185

186-
ext, err := factory.Create(context.Background(), extension.Settings{
186+
ext, err := factory.CreateExtension(context.Background(), extension.Settings{
187187
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
188188
}, cfg)
189189
require.NoError(t, err)
@@ -249,7 +249,7 @@ func TestGetAdaptiveSamplingComponentsErrors(t *testing.T) {
249249
func TestDependencies(t *testing.T) {
250250
factory := NewFactory()
251251
cfg := factory.CreateDefaultConfig().(*Config)
252-
ext, err := factory.Create(context.Background(), extension.Settings{
252+
ext, err := factory.CreateExtension(context.Background(), extension.Settings{
253253
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
254254
}, cfg)
255255
require.NoError(t, err)

‎cmd/jaeger/internal/extension/remotesampling/factory_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestCreateDefaultConfig(t *testing.T) {
2222
func TestCreateExtension(t *testing.T) {
2323
cfg := createDefaultConfig().(*Config)
2424
f := NewFactory()
25-
r, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
25+
r, err := f.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
2626
require.NoError(t, err)
2727
assert.NotNil(t, r)
2828
}

‎cmd/jaeger/internal/integration/span_writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func createSpanWriter(logger *zap.Logger, port int) (*spanWriter, error) {
4848
set := exportertest.NewNopSettings()
4949
set.Logger = logger
5050

51-
exporter, err := factory.CreateTraces(context.Background(), set, cfg)
51+
exporter, err := factory.CreateTracesExporter(context.Background(), set, cfg)
5252
if err != nil {
5353
return nil, err
5454
}

‎cmd/jaeger/internal/integration/storagecleaner/factory_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestCreateDefaultConfig(t *testing.T) {
2222
func TestCreateExtension(t *testing.T) {
2323
cfg := createDefaultConfig().(*Config)
2424
f := NewFactory()
25-
r, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
25+
r, err := f.CreateExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
2626
require.NoError(t, err)
2727
assert.NotNil(t, r)
2828
}

‎cmd/jaeger/internal/processors/adaptivesampling/processor_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
3737
MeterProvider: noopmetric.NewMeterProvider(),
3838
}
3939
extensionFactory := jaegerstorage.NewFactory()
40-
storageExtension, err := extensionFactory.Create(
40+
storageExtension, err := extensionFactory.CreateExtension(
4141
context.Background(),
4242
extension.Settings{
4343
TelemetrySettings: telemetrySettings,
@@ -61,7 +61,7 @@ var _ component.Config = (*Config)(nil)
6161

6262
func makeRemoteSamplingExtension(t *testing.T, cfg component.Config) component.Host {
6363
extensionFactory := remotesampling.NewFactory()
64-
samplingExtension, err := extensionFactory.Create(
64+
samplingExtension, err := extensionFactory.CreateExtension(
6565
context.Background(),
6666
extension.Settings{
6767
TelemetrySettings: component.TelemetrySettings{

0 commit comments

Comments
 (0)