Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion collector/receiver/telemetryapireceiver/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ type telemetryAPIReceiver struct {
exportInterval time.Duration
stopCh chan struct{}
wg sync.WaitGroup
lastEventTime pcommon.Timestamp
}

func (r *telemetryAPIReceiver) bindListener() (net.Listener, string, error) {
Expand Down Expand Up @@ -191,7 +192,10 @@ func (r *telemetryAPIReceiver) flushMetricsLocked(ctx context.Context) error {
scopeMetric.Scope().SetName(scopeName)
scopeMetric.SetSchemaUrl(semconv.SchemaURL)

ts := pcommon.NewTimestampFromTime(time.Now())
ts := r.lastEventTime
if ts == 0 {
ts = pcommon.NewTimestampFromTime(time.Now())
}
r.faaSMetricBuilders.coldstartsMetric.AppendDataPoints(scopeMetric, ts)
r.faaSMetricBuilders.errorsMetric.AppendDataPoints(scopeMetric, ts)
r.faaSMetricBuilders.timeoutsMetric.AppendDataPoints(scopeMetric, ts)
Expand Down Expand Up @@ -359,6 +363,12 @@ func (r *telemetryAPIReceiver) recordMetrics(slice []event) {
continue
}

if t, err := time.Parse(time.RFC3339, el.Time); err == nil {
if ets := pcommon.NewTimestampFromTime(t); ets > r.lastEventTime {
r.lastEventTime = ets
}
}

switch el.Type {
case string(telemetryapi.PlatformInitStart):
r.faaSMetricBuilders.coldstartsMetric.Add(1)
Expand Down
60 changes: 60 additions & 0 deletions collector/receiver/telemetryapireceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,66 @@ func TestRecordMetrics(t *testing.T) {
require.True(t, foundDuration)
}

func TestMetricTimestampMatchesEventTime(t *testing.T) {
r, err := newTelemetryAPIReceiver(
&Config{ExportInterval: 60000},
receivertest.NewNopSettings(Type),
)
require.NoError(t, err)
c := &mockConsumer{}
r.registerMetricsConsumer(c)

const earliest = "2006-01-02T15:04:04.000Z"
const latest = "2006-01-02T15:04:05.000Z"

slice := []event{
{
Time: earliest,
Type: "platform.initStart",
Record: map[string]any{
"functionName": "test-func",
},
},
{
Time: latest,
Type: "platform.runtimeDone",
Record: map[string]any{
"status": "success",
"metrics": map[string]any{
"durationMs": 100.0,
},
},
},
}
r.recordMetrics(slice)

err = r.flushMetrics(context.Background())
require.NoError(t, err)
require.Len(t, c.metricBatches, 1)

expected, err := time.Parse(time.RFC3339, latest)
require.NoError(t, err)
expectedTS := pcommon.NewTimestampFromTime(expected)

sm := c.metricBatches[0].ResourceMetrics().At(0).ScopeMetrics().At(0)
require.Greater(t, sm.Metrics().Len(), 0)
for i := 0; i < sm.Metrics().Len(); i++ {
m := sm.Metrics().At(i)
switch m.Type() {
case pmetric.MetricTypeSum:
dps := m.Sum().DataPoints()
for j := 0; j < dps.Len(); j++ {
require.Equal(t, expectedTS, dps.At(j).Timestamp(), "sum metric %q dp %d", m.Name(), j)
}
case pmetric.MetricTypeHistogram:
dps := m.Histogram().DataPoints()
for j := 0; j < dps.Len(); j++ {
require.Equal(t, expectedTS, dps.At(j).Timestamp(), "histogram metric %q dp %d", m.Name(), j)
}
}
}
}

func TestFlushMetricsIntervalImmediate(t *testing.T) {
// Test immediate flush when interval = 0
r, err := newTelemetryAPIReceiver(
Expand Down
Loading