Skip to content

Commit 8de50bc

Browse files
songy23songy23
authored
Merge branch 'main' into renovate/github.com-shirou-gopsutil-v4-4.x
2 parents 7dcda1a + 752ec37 commit 8de50bc

File tree

11 files changed

+55
-102
lines changed

11 files changed

+55
-102
lines changed

‎.chloggen/mx-psi_move-extensionstatus.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: Remove `extensiontest` StatusWatcher helpers
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: |
11+
They were unused. They may be added back on a different module or after `componentstatus` is marked 1.0
12+
13+
# One or more tracking issues or pull requests related to the change
14+
issues: [11044]
15+
16+
# (Optional) One or more lines of additional information to render under the primary note.
17+
# These lines will be padded with 2 spaces and then inserted directly into the document.
18+
# Use pipe (|) for multiline entries.
19+
subtext:
20+
21+
# Optional: The change log or logs in which this entry should be included.
22+
# e.g. '[user]' or '[user, api]'
23+
# Include 'user' if the change is relevant to end users.
24+
# Include 'api' if there is a change to a library API.
25+
# Default: '[user]'
26+
change_logs: [api]

‎config/configauth/go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,3 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemet
4848
replace go.opentelemetry.io/collector/extension => ../../extension
4949

5050
replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
51-
52-
replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus

‎exporter/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ require (
5555
github.com/prometheus/client_model v0.6.1 // indirect
5656
github.com/prometheus/common v0.57.0 // indirect
5757
github.com/prometheus/procfs v0.15.1 // indirect
58-
go.opentelemetry.io/collector/component/componentstatus v0.108.1 // indirect
5958
go.opentelemetry.io/collector/confmap v1.14.1 // indirect
6059
go.opentelemetry.io/collector/receiver/receiverprofiles v0.108.1 // indirect
6160
go.opentelemetry.io/otel/exporters/prometheus v0.51.0 // indirect

‎extension/auth/go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,3 @@ replace go.opentelemetry.io/collector/extension => ../
5959
replace go.opentelemetry.io/collector/pdata => ../../pdata
6060

6161
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
62-
63-
replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus

‎extension/experimental/storage/go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,3 @@ replace go.opentelemetry.io/collector/pdata => ../../../pdata
4141
replace go.opentelemetry.io/collector/confmap => ../../../confmap
4242

4343
replace go.opentelemetry.io/collector/config/configtelemetry => ../../../config/configtelemetry
44-
45-
replace go.opentelemetry.io/collector/component/componentstatus => ../../../component/componentstatus

‎extension/extensioncapabilities/go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,3 @@ replace go.opentelemetry.io/collector/confmap => ../../confmap
3939
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
4040

4141
replace go.opentelemetry.io/collector/component => ../../component
42-
43-
replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus

‎extension/extensiontest/statuswatcher_extension.go

-48
This file was deleted.

‎extension/extensiontest/statuswatcher_extension_test.go

-39
This file was deleted.

‎extension/go.mod

-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/google/uuid v1.6.0
77
github.com/stretchr/testify v1.9.0
88
go.opentelemetry.io/collector/component v0.108.1
9-
go.opentelemetry.io/collector/component/componentstatus v0.108.1
109
go.opentelemetry.io/collector/confmap v1.14.1
1110
go.uber.org/goleak v1.3.0
1211
)
@@ -57,5 +56,3 @@ replace go.opentelemetry.io/collector/confmap => ../confmap
5756
replace go.opentelemetry.io/collector/pdata => ../pdata
5857

5958
replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry
60-
61-
replace go.opentelemetry.io/collector/component/componentstatus => ../component/componentstatus

‎extension/memorylimiterextension/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ require (
4040
github.com/tklauser/go-sysconf v0.3.12 // indirect
4141
github.com/tklauser/numcpus v0.6.1 // indirect
4242
github.com/yusufpapurcu/wmi v1.2.4 // indirect
43-
go.opentelemetry.io/collector/component/componentstatus v0.108.1 // indirect
4443
go.opentelemetry.io/collector/config/configtelemetry v0.108.1 // indirect
4544
go.opentelemetry.io/collector/pdata v1.14.1 // indirect
4645
go.opentelemetry.io/otel v1.29.0 // indirect

‎otelcol/collector_test.go

+29-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"go.opentelemetry.io/collector/component"
2323
"go.opentelemetry.io/collector/component/componentstatus"
2424
"go.opentelemetry.io/collector/confmap"
25-
"go.opentelemetry.io/collector/extension/extensiontest"
25+
"go.opentelemetry.io/collector/extension"
2626
"go.opentelemetry.io/collector/processor/processortest"
2727
)
2828

@@ -136,6 +136,33 @@ func TestCollectorReportError(t *testing.T) {
136136
assert.Equal(t, StateClosed, col.GetState())
137137
}
138138

139+
// NewStatusWatcherExtensionFactory returns a component.ExtensionFactory to construct a status watcher extension.
140+
func NewStatusWatcherExtensionFactory(
141+
onStatusChanged func(source *componentstatus.InstanceID, event *componentstatus.Event),
142+
) extension.Factory {
143+
return extension.NewFactory(
144+
component.MustNewType("statuswatcher"),
145+
func() component.Config {
146+
return &struct{}{}
147+
},
148+
func(context.Context, extension.Settings, component.Config) (component.Component, error) {
149+
return &statusWatcherExtension{onStatusChanged: onStatusChanged}, nil
150+
},
151+
component.StabilityLevelStable)
152+
}
153+
154+
// statusWatcherExtension receives status events reported via component status reporting for testing
155+
// purposes.
156+
type statusWatcherExtension struct {
157+
component.StartFunc
158+
component.ShutdownFunc
159+
onStatusChanged func(source *componentstatus.InstanceID, event *componentstatus.Event)
160+
}
161+
162+
func (e statusWatcherExtension) ComponentStatusChanged(source *componentstatus.InstanceID, event *componentstatus.Event) {
163+
e.onStatusChanged(source, event)
164+
}
165+
139166
func TestComponentStatusWatcher(t *testing.T) {
140167
factories, err := nopFactories()
141168
assert.NoError(t, err)
@@ -159,7 +186,7 @@ func TestComponentStatusWatcher(t *testing.T) {
159186

160187
// Add a "statuswatcher" extension that will receive notifications when processor
161188
// status changes.
162-
factory := extensiontest.NewStatusWatcherExtensionFactory(onStatusChanged)
189+
factory := NewStatusWatcherExtensionFactory(onStatusChanged)
163190
factories.Extensions[factory.Type()] = factory
164191

165192
// Create a collector

0 commit comments

Comments
 (0)