Skip to content

Commit 0ec4553

Browse files
andrewlockbouwkast
andauthored
Apply suggestions from code review
Co-authored-by: Steven Bouwkamp <steven.bouwkamp@datadoghq.com>
1 parent 3660772 commit 0ec4553

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

tracer/src/Datadog.Trace/RuntimeMetrics/DiagnosticsMetricsRuntimeMetricsListener.cs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -205,21 +205,27 @@ public void Refresh()
205205
// aspnetcore metrics
206206
if (_aspnetcoreMetricsAvailable)
207207
{
208-
statsd.Gauge(MetricsNames.AspNetCoreCurrentRequests, Interlocked.Read(ref _activeRequests));
208+
var activeRequests = Interlocked.Read(ref _activeRequests);
209+
var failedRequests = Interlocked.Read(ref _failedRequests);
210+
var successRequests = Interlocked.Read(ref _successRequests);
211+
var queuedRequests = Interlocked.Read(ref _queuedRequests);
212+
var currentConnections = Interlocked.Read(ref _activeConnections);
213+
var queuedConnections = Interlocked.Read(ref _queuedConnections);
214+
var totalClosedConnections = Interlocked.Read(ref _totalClosedConnections);
215+
216+
statsd.Gauge(MetricsNames.AspNetCoreCurrentRequests, activeRequests);
209217
// Recording these as never-reset gauges seems a bit strange to me as it could easily overflow
210218
// but it's what the event listener already does, so I guess it's required (changing it would be problematic I think)
211-
var failed = Interlocked.Read(ref _failedRequests);
212-
statsd.Gauge(MetricsNames.AspNetCoreFailedRequests, failed);
213-
statsd.Gauge(MetricsNames.AspNetCoreTotalRequests, failed + Interlocked.Read(ref _successRequests));
214-
statsd.Gauge(MetricsNames.AspNetCoreRequestQueueLength, Interlocked.Read(ref _queuedRequests));
219+
statsd.Gauge(MetricsNames.AspNetCoreFailedRequests, failedRequests);
220+
statsd.Gauge(MetricsNames.AspNetCoreTotalRequests, failedRequests + successRequests);
221+
statsd.Gauge(MetricsNames.AspNetCoreRequestQueueLength, queuedRequests);
215222

216-
var currentConnections = Interlocked.Read(ref _activeConnections);
217223
statsd.Gauge(MetricsNames.AspNetCoreCurrentConnections, currentConnections);
218-
statsd.Gauge(MetricsNames.AspNetCoreConnectionQueueLength, Interlocked.Read(ref _queuedConnections));
224+
statsd.Gauge(MetricsNames.AspNetCoreConnectionQueueLength, queuedConnections);
219225

220226
// Same here, seems risky to have this as a gauge, but I think that ship has sailed
221227
// Note also that as _totalClosedConnections doesn't include _current_ connections, we add that in
222-
statsd.Gauge(MetricsNames.AspNetCoreTotalConnections, Interlocked.Read(ref _totalClosedConnections) + currentConnections);
228+
statsd.Gauge(MetricsNames.AspNetCoreTotalConnections, totalClosedConnections + currentConnections);
223229
Log.Debug($"Sent the following metrics to the DD agent: {MetricsNames.AspNetCoreCurrentRequests}, {MetricsNames.AspNetCoreFailedRequests}, {MetricsNames.AspNetCoreTotalRequests}, {MetricsNames.AspNetCoreRequestQueueLength}, {MetricsNames.AspNetCoreCurrentConnections}, {MetricsNames.AspNetCoreConnectionQueueLength}, {MetricsNames.AspNetCoreTotalConnections}");
224230
}
225231
}
@@ -324,7 +330,7 @@ private void OnInstrumentPublished(Instrument instrument, MeterListener listener
324330
{
325331
if (Log.IsEnabled(LogEventLevel.Debug))
326332
{
327-
Log.Debug("Enabled measurement events for instrument: {MeterName}/{InstrumentName} ", instrumentName, meterName);
333+
Log.Debug("Enabled measurement events for instrument: {MeterName}/{InstrumentName} ", meterName, instrumentName);
328334
}
329335

330336
listener.EnableMeasurementEvents(instrument, state: this);

0 commit comments

Comments
 (0)