Merge branch 'master' of github.com:Workiva/w_module into AF-1540_consumer-specified-timing

Author: toddbeckman-wf

lib/src/lifecycle_module.dart

@@ -1071,6 +1071,7 @@ abstract class LifecycleModule extends SimpleModule with Disposable {
       rethrow;
     } finally {
       _activeSpan?.finish();
+      _activeSpan = null;
     }
   }
 }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: w_module
-version: 2.0.1
+version: 2.0.2
 description: Base module classes with a well defined lifecycle for modular Dart applications.
 authors:
   - Workiva Client Platform Team <[email protected]>

test/lifecycle_module_test.dart

@@ -100,6 +100,11 @@ class TestLifecycleModule extends LifecycleModule {
     ];
   }
 
+  // Overriding without re-applying the @protected annotation allows us to call
+  // activeSpan in our tests below.
+  @override
+  Span get activeSpan => super.activeSpan;
+
   // Overriding without re-applying the @protected annotation allows us to call
   // loadChildModule in our tests below.
   @override
@@ -484,6 +489,11 @@ void runTests(bool runSpanTests) {
             module.specifyFirstUsefulState();
           });
         });
+
+        test('activeSpan should be null when load is finished', () async {
+          await module.load();
+          expect(module.activeSpan, isNull);
+        });
       }
 
       group('with an onLoad that throws', () {
@@ -866,6 +876,7 @@ void runTests(bool runSpanTests) {
             ['willResume', 'onResume', 'didResume']
               ..addAll(expectedSuspendEvents));
       });
+
       test('should emit lifecycle log events', () async {
         await gotoState(module, LifecycleState.loaded);
         expect(
@@ -892,6 +903,12 @@ void runTests(bool runSpanTests) {
           await module.suspend();
         });
 
+        test('activeSpan should be null when suspend is finished', () async {
+          await gotoState(module, LifecycleState.loaded);
+          await module.suspend();
+          expect(module.activeSpan, isNull);
+        });
+
         test(
             'if a transition is in progress should wait to start this until that finishes',
             () async {
@@ -1170,6 +1187,12 @@ void runTests(bool runSpanTests) {
           await module.resume();
         });
 
+        test('activeSpan should be null when resume is finished', () async {
+          await gotoState(module, LifecycleState.suspended);
+          await module.resume();
+          expect(module.activeSpan, isNull);
+        });
+
         test(
             'if a transition is in progress should wait to start this until that finishes',
             () async {
@@ -2135,6 +2158,11 @@ void runTests(bool runSpanTests) {
           expect(span.parentContext.spanId, parentUnloadContext.spanId);
           expect(span.tags['custom.unload.tag'], 'somevalue');
         });
+
+        test('activeSpan should be null when unload is finished', () async {
+          await parentModule.unload();
+          expect(parentModule.activeSpan, isNull);
+        });
       }
 
       test('should emit lifecycle log events', () async {