@@ -159,15 +159,20 @@ public void EventCountersEnabled()
159
159
public void Metrics_RequestDuration_RecordedWithHttpActivity ( )
160
160
{
161
161
// Arrange
162
+ Activity measurementActivity = null ;
163
+ var measureCount = 0 ;
164
+
165
+ // Listen to hosting activity source.
166
+ var testSource = new ActivitySource ( Path . GetRandomFileName ( ) ) ;
162
167
using var activityListener = new ActivityListener
163
168
{
164
- ShouldListenTo = activitySource => activitySource . Name == "Microsoft.AspNetCore" ,
169
+ ShouldListenTo = activitySource => ReferenceEquals ( activitySource , testSource ) ,
165
170
Sample = ( ref ActivityCreationOptions < ActivityContext > _ ) => ActivitySamplingResult . AllData
166
171
} ;
167
172
ActivitySource . AddActivityListener ( activityListener ) ;
168
173
174
+ // Listen to http.server.request.duration.
169
175
var testMeterFactory = new TestMeterFactory ( ) ;
170
-
171
176
var meterListener = new MeterListener ( ) ;
172
177
meterListener . InstrumentPublished = ( i , l ) =>
173
178
{
@@ -176,9 +181,6 @@ public void Metrics_RequestDuration_RecordedWithHttpActivity()
176
181
l . EnableMeasurementEvents ( i ) ;
177
182
}
178
183
} ;
179
-
180
- Activity measurementActivity = null ;
181
- var measureCount = 0 ;
182
184
meterListener . SetMeasurementEventCallback < double > ( ( i , m , t , s ) =>
183
185
{
184
186
if ( Interlocked . Increment ( ref measureCount ) > 1 )
@@ -191,7 +193,7 @@ public void Metrics_RequestDuration_RecordedWithHttpActivity()
191
193
meterListener . Start ( ) ;
192
194
193
195
// Act
194
- var hostingApplication = CreateApplication ( out var features , meterFactory : testMeterFactory ) ;
196
+ var hostingApplication = CreateApplication ( out var features , activitySource : testSource , meterFactory : testMeterFactory ) ;
195
197
var context = hostingApplication . CreateContext ( features ) ;
196
198
hostingApplication . DisposeContext ( context , null ) ;
197
199
0 commit comments