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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- Added `unique_skipped_as_duplicate` attributes to otel `insert_many` spans and `insert_count` metric. [PR #58](https://github.com/riverqueue/rivercontrib/pull/58).
- Add `kinds` span attribute to `otelriver` `insert_many` spans listing the distinct job kinds in each batch. [PR #62](https://github.com/riverqueue/rivercontrib/pull/62).

### Changed

Expand Down
13 changes: 12 additions & 1 deletion otelriver/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"cmp"
"context"
"errors"
"slices"
"time"

"go.opentelemetry.io/otel"
Expand Down Expand Up @@ -164,8 +165,18 @@ func (m *Middleware) InsertMany(ctx context.Context, manyParams []*rivertype.Job
}
}

kinds := make([]string, 0, len(manyParams))
for _, p := range manyParams {
kinds = append(kinds, p.Kind)
}
slices.Sort(kinds)
kinds = slices.Compact(kinds)

span.SetAttributes(attrs...) // set after finalizing status
span.SetAttributes(attribute.Int64("unique_skipped_as_duplicate_count", skipped))
span.SetAttributes(
attribute.Int64("unique_skipped_as_duplicate_count", skipped),
attribute.StringSlice("kinds", kinds),
)

// This allocates a new slice, so make sure to do it as few times as possible.
measurementOpt := metric.WithAttributes(attrs...)
Expand Down
31 changes: 31 additions & 0 deletions otelriver/middleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func TestMiddleware(t *testing.T) {
require.Equal(t, "river.insert_many", span.Name)
require.Equal(t, codes.Ok, span.Status.Code)
require.EqualValues(t, 0, getAttribute(t, span.Attributes, "unique_skipped_as_duplicate_count").AsInt64())
require.Equal(t, []string{"no_op"}, getAttribute(t, span.Attributes, "kinds").AsStringSlice())

var (
expectedAttrs = []attribute.KeyValue{
Expand Down Expand Up @@ -130,6 +131,7 @@ func TestMiddleware(t *testing.T) {
require.Equal(t, codes.Error, span.Status.Code)
require.Equal(t, "error from doInner", span.Status.Description)
require.EqualValues(t, 0, getAttribute(t, span.Attributes, "unique_skipped_as_duplicate_count").AsInt64())
require.Equal(t, []string{"no_op"}, getAttribute(t, span.Attributes, "kinds").AsStringSlice())

var (
expectedAttrs = []attribute.KeyValue{
Expand Down Expand Up @@ -172,6 +174,7 @@ func TestMiddleware(t *testing.T) {
require.Equal(t, codes.Error, span.Status.Code)
require.Equal(t, "panic", span.Status.Description)
require.EqualValues(t, 0, getAttribute(t, span.Attributes, "unique_skipped_as_duplicate_count").AsInt64())
require.Equal(t, []string{"no_op"}, getAttribute(t, span.Attributes, "kinds").AsStringSlice())

var (
expectedAttrs = []attribute.KeyValue{
Expand Down Expand Up @@ -273,6 +276,34 @@ func TestMiddleware(t *testing.T) {
requireSumByAttrs(t, metrics, "river.insert_count", 5)
})

t.Run("InsertManyMixedKinds", func(t *testing.T) {
t.Parallel()

middleware, bundle := setup(t)

doInner := func(ctx context.Context) ([]*rivertype.JobInsertResult, error) {
return []*rivertype.JobInsertResult{
{Job: &rivertype.JobRow{ID: 1}},
{Job: &rivertype.JobRow{ID: 2}},
{Job: &rivertype.JobRow{ID: 3}},
}, nil
}

_, err := middleware.InsertMany(ctx, []*rivertype.JobInsertParams{
{Kind: "email_send"},
{Kind: "notification"},
{Kind: "email_send"},
}, doInner)
require.NoError(t, err)

spans := bundle.traceExporter.GetSpans()
require.Len(t, spans, 1)
// kinds are deduplicated and sorted so identical batches produce
// identical span attributes.
require.Equal(t, []string{"email_send", "notification"},
getAttribute(t, spans[0].Attributes, "kinds").AsStringSlice())
})

t.Run("InsertManyDurationUnitMS", func(t *testing.T) {
t.Parallel()

Expand Down
Loading