Skip to content

Commit edb52fe

Browse files
committed
Change lifecycle tests per open-telemetry#2757
1 parent 88603c1 commit edb52fe

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

service/defaultcomponents/default_exporters_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ func verifyExporterLifecycle(t *testing.T, factory component.ExporterFactory, ge
176176
}
177177
require.NoError(t, err)
178178
require.NoError(t, firstExp.Start(ctx, host))
179+
require.NoError(t, firstExp.Shutdown(ctx))
179180

180181
secondExp, err := createFn(ctx, expCreateParams, getConfigFn())
181-
assert.NoError(t, err)
182+
require.NoError(t, err)
182183

183-
assert.NoError(t, firstExp.Shutdown(ctx))
184-
assert.NoError(t, secondExp.Start(ctx, host))
185-
assert.NoError(t, secondExp.Shutdown(ctx))
184+
require.NoError(t, secondExp.Start(ctx, host))
185+
require.NoError(t, secondExp.Shutdown(ctx))
186186
}
187187
}
188188

service/defaultcomponents/default_extensions_test.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// Program otelcol is the OpenTelemetry Collector that collects stats
16-
// and traces and exports to a configured backend.
1715
package defaultcomponents
1816

1917
import (
@@ -89,13 +87,13 @@ func verifyExtensionLifecycle(t *testing.T, factory component.ExtensionFactory,
8987
firstExt, err := factory.CreateExtension(ctx, extCreateParams, getConfigFn())
9088
require.NoError(t, err)
9189
require.NoError(t, firstExt.Start(ctx, host))
90+
require.NoError(t, firstExt.Shutdown(ctx))
9291

9392
secondExt, err := factory.CreateExtension(ctx, extCreateParams, getConfigFn())
94-
assert.NoError(t, err)
93+
require.NoError(t, err)
9594

96-
assert.NoError(t, firstExt.Shutdown(ctx))
97-
assert.NoError(t, secondExt.Start(ctx, host))
98-
assert.NoError(t, secondExt.Shutdown(ctx))
95+
require.NoError(t, secondExt.Start(ctx, host))
96+
require.NoError(t, secondExt.Shutdown(ctx))
9997
}
10098

10199
// assertNoErrorHost implements a component.Host that asserts that there were no errors.

service/defaultcomponents/default_processors_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ func verifyProcessorLifecycle(t *testing.T, factory component.ProcessorFactory,
138138
}
139139
require.NoError(t, err)
140140
require.NoError(t, firstExp.Start(ctx, host))
141+
require.NoError(t, firstExp.Shutdown(ctx))
141142

142143
secondExp, err := createFn(ctx, processorCreateParams, getConfigFn())
143-
assert.NoError(t, err)
144+
require.NoError(t, err)
144145

145-
assert.NoError(t, firstExp.Shutdown(ctx))
146-
assert.NoError(t, secondExp.Start(ctx, host))
147-
assert.NoError(t, secondExp.Shutdown(ctx))
146+
require.NoError(t, secondExp.Start(ctx, host))
147+
require.NoError(t, secondExp.Shutdown(ctx))
148148
}
149149
}
150150

service/defaultcomponents/default_receivers_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ func verifyReceiverLifecycle(t *testing.T, factory component.ReceiverFactory, ge
130130
}
131131
require.NoError(t, err)
132132
require.NoError(t, firstRcvr.Start(ctx, host))
133+
require.NoError(t, firstRcvr.Shutdown(ctx))
133134

134135
secondRcvr, err := createFn(ctx, receiverCreateParams, getConfigFn())
135-
assert.NoError(t, err)
136+
require.NoError(t, err)
136137

137-
assert.NoError(t, firstRcvr.Shutdown(ctx))
138-
assert.NoError(t, secondRcvr.Start(ctx, host))
139-
assert.NoError(t, secondRcvr.Shutdown(ctx))
138+
require.NoError(t, secondRcvr.Start(ctx, host))
139+
require.NoError(t, secondRcvr.Shutdown(ctx))
140140
}
141141
}
142142

0 commit comments

Comments
 (0)