Skip to content

Commit bd3991a

Browse files
authored
Merge branch 'main' into fix/ocb-duplicate-cli-error-log
2 parents 4f49aea + c216239 commit bd3991a

File tree

8 files changed

+55
-14
lines changed

8 files changed

+55
-14
lines changed

.chloggen/add_nop_profiles.yaml

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: 'enhancement'
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: receiver/nop
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: add profiles signal support
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14253]
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: []

receiver/nopreceiver/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
<!-- status autogenerated section -->
44
| Status | |
55
| ------------- |-----------|
6-
| Stability | [beta]: traces, metrics, logs |
6+
| Stability | [development]: profiles |
7+
| | [beta]: traces, metrics, logs |
78
| Distributions | [core], [contrib] |
89
| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fnop%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Fnop) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fnop%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Fnop) |
910
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@evan-bradley](https://www.github.com/evan-bradley) |
1011

12+
[development]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#development
1113
[beta]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#beta
1214
[core]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol
1315
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib

receiver/nopreceiver/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ require (
99
go.opentelemetry.io/collector/confmap v1.49.0
1010
go.opentelemetry.io/collector/consumer v1.49.0
1111
go.opentelemetry.io/collector/consumer/consumertest v0.143.0
12+
go.opentelemetry.io/collector/consumer/xconsumer v0.143.0
1213
go.opentelemetry.io/collector/pdata v1.49.0
1314
go.opentelemetry.io/collector/receiver v1.49.0
1415
go.opentelemetry.io/collector/receiver/receivertest v0.143.0
16+
go.opentelemetry.io/collector/receiver/xreceiver v0.143.0
1517
go.uber.org/goleak v1.3.0
1618
go.uber.org/zap v1.27.1
1719
)
@@ -36,11 +38,9 @@ require (
3638
github.com/pmezard/go-difflib v1.0.0 // indirect
3739
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
3840
go.opentelemetry.io/collector/consumer/consumererror v0.143.0 // indirect
39-
go.opentelemetry.io/collector/consumer/xconsumer v0.143.0 // indirect
4041
go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
4142
go.opentelemetry.io/collector/pdata/pprofile v0.143.0 // indirect
4243
go.opentelemetry.io/collector/pipeline v1.49.0 // indirect
43-
go.opentelemetry.io/collector/receiver/xreceiver v0.143.0 // indirect
4444
go.opentelemetry.io/otel v1.39.0 // indirect
4545
go.opentelemetry.io/otel/metric v1.39.0 // indirect
4646
go.opentelemetry.io/otel/sdk v1.39.0 // indirect

receiver/nopreceiver/internal/metadata/generated_status.go

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

receiver/nopreceiver/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ status:
99
class: receiver
1010
stability:
1111
beta: [traces, metrics, logs]
12+
development: [profiles]
1213
distributions: [core, contrib]

receiver/nopreceiver/nop_receiver.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@ import (
88

99
"go.opentelemetry.io/collector/component"
1010
"go.opentelemetry.io/collector/consumer"
11+
"go.opentelemetry.io/collector/consumer/xconsumer"
1112
"go.opentelemetry.io/collector/receiver"
1213
"go.opentelemetry.io/collector/receiver/nopreceiver/internal/metadata"
14+
"go.opentelemetry.io/collector/receiver/xreceiver"
1315
)
1416

1517
// NewFactory returns a receiver.Factory that constructs nop receivers.
16-
func NewFactory() receiver.Factory {
17-
return receiver.NewFactory(
18+
func NewFactory() xreceiver.Factory {
19+
return xreceiver.NewFactory(
1820
metadata.Type,
1921
func() component.Config { return &struct{}{} },
20-
receiver.WithTraces(createTraces, metadata.TracesStability),
21-
receiver.WithMetrics(createMetrics, metadata.MetricsStability),
22-
receiver.WithLogs(createLogs, metadata.LogsStability))
22+
xreceiver.WithTraces(createTraces, metadata.TracesStability),
23+
xreceiver.WithMetrics(createMetrics, metadata.MetricsStability),
24+
xreceiver.WithProfiles(createProfiles, metadata.ProfilesStability),
25+
xreceiver.WithLogs(createLogs, metadata.LogsStability))
2326
}
2427

2528
func createTraces(context.Context, receiver.Settings, component.Config, consumer.Traces) (receiver.Traces, error) {
@@ -34,6 +37,10 @@ func createLogs(context.Context, receiver.Settings, component.Config, consumer.L
3437
return nopInstance, nil
3538
}
3639

40+
func createProfiles(context.Context, receiver.Settings, component.Config, xconsumer.Profiles) (xreceiver.Profiles, error) {
41+
return nopInstance, nil
42+
}
43+
3744
var nopInstance = &nopReceiver{}
3845

3946
type nopReceiver struct {

receiver/nopreceiver/nop_receiver_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,9 @@ func TestNewNopFactory(t *testing.T) {
3737
require.NoError(t, err)
3838
assert.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost()))
3939
assert.NoError(t, logs.Shutdown(context.Background()))
40+
41+
profiles, err := factory.CreateProfiles(context.Background(), receivertest.NewNopSettings(receivertest.NopType), cfg, consumertest.NewNop())
42+
require.NoError(t, err)
43+
assert.NoError(t, profiles.Start(context.Background(), componenttest.NewNopHost()))
44+
assert.NoError(t, profiles.Shutdown(context.Background()))
4045
}

renovate.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
"gomod"
8787
],
8888
"groupName": "All google.golang.org packages",
89-
"matchSourceUrls": [
90-
"https://google.golang.org{/,}**"
89+
"matchPackageNames": [
90+
"google.golang.org{/,}**"
9191
]
9292
},
9393
{
@@ -144,6 +144,6 @@
144144
"prEditedNotification"
145145
],
146146
"postUpdateOptions": [
147-
"gomodTidy",
147+
"gomodTidy"
148148
]
149149
}

0 commit comments

Comments
 (0)