Skip to content

Commit 9d67bd0

Browse files
authored
Introduce NewProfiles and deprecate NewProfilesExporter in xexporterhelper (#13372)
#### Description `NewProfilesExporter` was never renamed to `NewProfiles`, when every other signal removed the `Exporter` part of its new method in #11370.
1 parent 1ebb9b2 commit 9d67bd0

File tree

6 files changed

+44
-16
lines changed

6 files changed

+44
-16
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: deprecation
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: xexporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Introduce NewProfiles method and deprecate NewProfilesExporter
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [13372]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

exporter/debugexporter/factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func createProfiles(ctx context.Context, set exporter.Settings, config component
9090
cfg := config.(*Config)
9191
exporterLogger := createLogger(cfg, set.Logger)
9292
debug := newDebugExporter(exporterLogger, cfg.Verbosity)
93-
return xexporterhelper.NewProfilesExporter(ctx, set, config,
93+
return xexporterhelper.NewProfiles(ctx, set, config,
9494
debug.pushProfiles,
9595
exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
9696
exporterhelper.WithTimeout(exporterhelper.TimeoutConfig{Timeout: 0}),

exporter/exporterhelper/xexporterhelper/profiles.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ type profileExporter struct {
114114
xconsumer.Profiles
115115
}
116116

117-
// NewProfilesExporter creates an xexporter.Profiles that records observability metrics and wraps every request with a Span.
118-
func NewProfilesExporter(
117+
// NewProfiles creates an xexporter.Profiles that records observability metrics and wraps every request with a Span.
118+
func NewProfiles(
119119
ctx context.Context,
120120
set exporter.Settings,
121121
cfg component.Config,
@@ -132,6 +132,9 @@ func NewProfilesExporter(
132132
append([]exporterhelper.Option{internal.WithQueueBatchSettings(NewProfilesQueueBatchSettings())}, options...)...)
133133
}
134134

135+
// Deprecated: [v0.130.0] use NewProfiles.
136+
var NewProfilesExporter = NewProfiles
137+
135138
// requestConsumeFromProfiles returns a RequestConsumeFunc that consumes pprofile.Profiles.
136139
func requestConsumeFromProfiles(pusher xconsumer.ConsumeProfilesFunc) exporterhelper.RequestConsumeFunc {
137140
return func(ctx context.Context, request exporterhelper.Request) error {

exporter/exporterhelper/xexporterhelper/profiles_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ func TestProfilesRequest(t *testing.T) {
5858
}
5959

6060
func TestProfilesExporter_InvalidName(t *testing.T) {
61-
le, err := NewProfilesExporter(context.Background(), exportertest.NewNopSettings(exportertest.NopType), nil, newPushProfilesData(nil))
61+
le, err := NewProfiles(context.Background(), exportertest.NewNopSettings(exportertest.NopType), nil, newPushProfilesData(nil))
6262
require.Nil(t, le)
6363
require.Equal(t, errNilConfig, err)
6464
}
6565

6666
func TestProfilesExporter_NilLogger(t *testing.T) {
67-
le, err := NewProfilesExporter(context.Background(), exporter.Settings{}, &fakeProfilesExporterConfig, newPushProfilesData(nil))
67+
le, err := NewProfiles(context.Background(), exporter.Settings{}, &fakeProfilesExporterConfig, newPushProfilesData(nil))
6868
require.Nil(t, le)
6969
require.Equal(t, errNilLogger, err)
7070
}
@@ -76,7 +76,7 @@ func TestProfilesRequestExporter_NilLogger(t *testing.T) {
7676
}
7777

7878
func TestProfilesExporter_NilPushProfilesData(t *testing.T) {
79-
le, err := NewProfilesExporter(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, nil)
79+
le, err := NewProfiles(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, nil)
8080
require.Nil(t, le)
8181
require.Equal(t, errNilPushProfileData, err)
8282
}
@@ -95,7 +95,7 @@ func TestProfilesRequestExporter_NilProfilesConverter(t *testing.T) {
9595

9696
func TestProfilesExporter_Default(t *testing.T) {
9797
ld := pprofile.NewProfiles()
98-
le, err := NewProfilesExporter(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(nil))
98+
le, err := NewProfiles(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(nil))
9999
assert.NotNil(t, le)
100100
require.NoError(t, err)
101101

@@ -120,7 +120,7 @@ func TestProfilesRequestExporter_Default(t *testing.T) {
120120

121121
func TestProfilesExporter_WithCapabilities(t *testing.T) {
122122
capabilities := consumer.Capabilities{MutatesData: true}
123-
le, err := NewProfilesExporter(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(nil), exporterhelper.WithCapabilities(capabilities))
123+
le, err := NewProfiles(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(nil), exporterhelper.WithCapabilities(capabilities))
124124
require.NoError(t, err)
125125
require.NotNil(t, le)
126126

@@ -140,7 +140,7 @@ func TestProfilesRequestExporter_WithCapabilities(t *testing.T) {
140140
func TestProfilesExporter_Default_ReturnError(t *testing.T) {
141141
ld := pprofile.NewProfiles()
142142
want := errors.New("my_error")
143-
le, err := NewProfilesExporter(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(want))
143+
le, err := NewProfiles(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(want))
144144
require.NoError(t, err)
145145
require.NotNil(t, le)
146146
require.Equal(t, want, le.ConsumeProfiles(context.Background(), ld))
@@ -218,7 +218,7 @@ func TestProfiles_WithPersistentQueue(t *testing.T) {
218218
})
219219

220220
ts := consumertest.ProfilesSink{}
221-
te, err := NewProfilesExporter(context.Background(), set, &fakeProfilesExporterConfig, ts.ConsumeProfiles, exporterhelper.WithQueue(qCfg))
221+
te, err := NewProfiles(context.Background(), set, &fakeProfilesExporterConfig, ts.ConsumeProfiles, exporterhelper.WithQueue(qCfg))
222222
require.NoError(t, err)
223223
require.NoError(t, te.Start(context.Background(), host))
224224
t.Cleanup(func() { require.NoError(t, te.Shutdown(context.Background())) })
@@ -247,7 +247,7 @@ func TestProfilesExporter_WithSpan(t *testing.T) {
247247
otel.SetTracerProvider(set.TracerProvider)
248248
defer otel.SetTracerProvider(nooptrace.NewTracerProvider())
249249

250-
le, err := NewProfilesExporter(context.Background(), set, &fakeProfilesExporterConfig, newPushProfilesData(nil))
250+
le, err := NewProfiles(context.Background(), set, &fakeProfilesExporterConfig, newPushProfilesData(nil))
251251
require.NoError(t, err)
252252
require.NotNil(t, le)
253253
checkWrapSpanForProfilesExporter(t, sr, set.TracerProvider.Tracer("test"), le, nil)
@@ -274,7 +274,7 @@ func TestProfilesExporter_WithSpan_ReturnError(t *testing.T) {
274274
defer otel.SetTracerProvider(nooptrace.NewTracerProvider())
275275

276276
want := errors.New("my_error")
277-
le, err := NewProfilesExporter(context.Background(), set, &fakeProfilesExporterConfig, newPushProfilesData(want))
277+
le, err := NewProfiles(context.Background(), set, &fakeProfilesExporterConfig, newPushProfilesData(want))
278278
require.NoError(t, err)
279279
require.NotNil(t, le)
280280
checkWrapSpanForProfilesExporter(t, sr, set.TracerProvider.Tracer("test"), le, want)
@@ -298,7 +298,7 @@ func TestProfilesExporter_WithShutdown(t *testing.T) {
298298
shutdownCalled := false
299299
shutdown := func(context.Context) error { shutdownCalled = true; return nil }
300300

301-
le, err := NewProfilesExporter(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(nil), exporterhelper.WithShutdown(shutdown))
301+
le, err := NewProfiles(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(nil), exporterhelper.WithShutdown(shutdown))
302302
assert.NotNil(t, le)
303303
require.NoError(t, err)
304304

@@ -323,7 +323,7 @@ func TestProfilesExporter_WithShutdown_ReturnError(t *testing.T) {
323323
want := errors.New("my_error")
324324
shutdownErr := func(context.Context) error { return want }
325325

326-
le, err := NewProfilesExporter(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(nil), exporterhelper.WithShutdown(shutdownErr))
326+
le, err := NewProfiles(context.Background(), exportertest.NewNopSettings(exportertest.NopType), &fakeProfilesExporterConfig, newPushProfilesData(nil), exporterhelper.WithShutdown(shutdownErr))
327327
assert.NotNil(t, le)
328328
require.NoError(t, err)
329329

exporter/otlpexporter/factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func createProfilesExporter(
110110
) (xexporter.Profiles, error) {
111111
oce := newExporter(cfg, set)
112112
oCfg := cfg.(*Config)
113-
return xexporterhelper.NewProfilesExporter(ctx, set, cfg,
113+
return xexporterhelper.NewProfiles(ctx, set, cfg,
114114
oce.pushProfiles,
115115
exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
116116
exporterhelper.WithTimeout(oCfg.TimeoutConfig),

exporter/otlphttpexporter/factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func createProfiles(
166166
return nil, err
167167
}
168168

169-
return xexporterhelper.NewProfilesExporter(ctx, set, cfg,
169+
return xexporterhelper.NewProfiles(ctx, set, cfg,
170170
oce.pushProfiles,
171171
exporterhelper.WithStart(oce.start),
172172
exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),

0 commit comments

Comments
 (0)