feat: es trace

xh-polaris · Dec 9, 2023 · 9bb35c2 · 9bb35c2
1 parent fcd0eb0
commit 9bb35c2
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/biz/infrastructure/mapper/cat/es.go b/biz/infrastructure/mapper/cat/es.go
@@ -14,7 +14,9 @@ import (
 	"github.com/elastic/go-elasticsearch/v8/typedapi/types"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/types/enums/sortorder"
 	"github.com/mitchellh/mapstructure"
+	"github.com/zeromicro/go-zero/core/trace"
 	"go.mongodb.org/mongo-driver/bson/primitive"
+	oteltrace "go.opentelemetry.io/otel/trace"
 
 	"github.com/xh-polaris/meowchat-content/biz/infrastructure/config"
 	"github.com/xh-polaris/meowchat-content/biz/infrastructure/consts"
@@ -50,6 +52,10 @@ func NewEsMapper(config *config.Config) IEsMapper {
 }
 
 func (m *EsMapper) Search(ctx context.Context, communityId, keyword string, skip, count int) ([]*Cat, int64, error) {
+	ctx, span := trace.TracerFromContext(ctx).Start(ctx, "elasticsearch/Search", oteltrace.WithTimestamp(time.Now()), oteltrace.WithSpanKind(oteltrace.SpanKindClient))
+	defer func() {
+		span.End(oteltrace.WithTimestamp(time.Now()))
+	}()
 	res, err := m.es.Search().From(skip).Size(count).Index(m.indexName).Request(&search.Request{
 		Query: &types.Query{
 			Bool: &types.BoolQuery{

diff --git a/biz/infrastructure/mapper/moment/es.go b/biz/infrastructure/mapper/moment/es.go
@@ -9,18 +9,19 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/elastic/go-elasticsearch/v8"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/core/count"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/core/search"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/types"
+	"github.com/mitchellh/mapstructure"
 	"github.com/xh-polaris/gopkg/pagination"
 	"github.com/xh-polaris/gopkg/pagination/esp"
+	"github.com/zeromicro/go-zero/core/trace"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	oteltrace "go.opentelemetry.io/otel/trace"
 
 	"github.com/xh-polaris/meowchat-content/biz/infrastructure/config"
 	"github.com/xh-polaris/meowchat-content/biz/infrastructure/consts"
-
-	"github.com/elastic/go-elasticsearch/v8"
-	"github.com/mitchellh/mapstructure"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 type (
@@ -54,6 +55,10 @@ func NewEsMapper(config *config.Config) IEsMapper {
 }
 
 func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *FilterOptions, popts *pagination.PaginationOptions, sorter esp.EsCursor) ([]*Moment, int64, error) {
+	ctx, span := trace.TracerFromContext(ctx).Start(ctx, "elasticsearch/Search", oteltrace.WithTimestamp(time.Now()), oteltrace.WithSpanKind(oteltrace.SpanKindClient))
+	defer func() {
+		span.End(oteltrace.WithTimestamp(time.Now()))
+	}()
 	p := esp.NewEsPaginator(pagination.NewRawStore(sorter), popts)
 	s, sa, err := p.MakeSortOptions(ctx)
 	if err != nil {
@@ -119,6 +124,10 @@ func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *Filte
 }
 
 func (m *EsMapper) CountWithQuery(ctx context.Context, query []types.Query, fopts *FilterOptions) (int64, error) {
+	ctx, span := trace.TracerFromContext(ctx).Start(ctx, "elasticsearch/Count", oteltrace.WithTimestamp(time.Now()), oteltrace.WithSpanKind(oteltrace.SpanKindClient))
+	defer func() {
+		span.End(oteltrace.WithTimestamp(time.Now()))
+	}()
 	f := makeEsFilter(fopts)
 	res, err := m.es.Count().Index(m.indexName).Request(&count.Request{
 		Query: &types.Query{

diff --git a/biz/infrastructure/mapper/plan/es.go b/biz/infrastructure/mapper/plan/es.go
@@ -14,6 +14,8 @@ import (
 	"github.com/elastic/go-elasticsearch/v8/typedapi/types"
 	"github.com/xh-polaris/gopkg/pagination"
 	"github.com/xh-polaris/gopkg/pagination/esp"
+	"github.com/zeromicro/go-zero/core/trace"
+	oteltrace "go.opentelemetry.io/otel/trace"
 
 	"github.com/xh-polaris/meowchat-content/biz/infrastructure/config"
 	"github.com/xh-polaris/meowchat-content/biz/infrastructure/consts"
@@ -54,6 +56,10 @@ func NewEsMapper(config *config.Config) IEsMapper {
 }
 
 func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *FilterOptions, popts *pagination.PaginationOptions, sorter esp.EsCursor) ([]*Plan, int64, error) {
+	ctx, span := trace.TracerFromContext(ctx).Start(ctx, "elasticsearch/Search", oteltrace.WithTimestamp(time.Now()), oteltrace.WithSpanKind(oteltrace.SpanKindClient))
+	defer func() {
+		span.End(oteltrace.WithTimestamp(time.Now()))
+	}()
 	p := esp.NewEsPaginator(pagination.NewRawStore(sorter), popts)
 	s, sa, err := p.MakeSortOptions(ctx)
 	if err != nil {
@@ -125,6 +131,10 @@ func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *Filte
 }
 
 func (m *EsMapper) CountWithQuery(ctx context.Context, query []types.Query, fopts *FilterOptions) (int64, error) {
+	ctx, span := trace.TracerFromContext(ctx).Start(ctx, "elasticsearch/Conut", oteltrace.WithTimestamp(time.Now()), oteltrace.WithSpanKind(oteltrace.SpanKindClient))
+	defer func() {
+		span.End(oteltrace.WithTimestamp(time.Now()))
+	}()
 	f := makeEsFilter(fopts)
 	res, err := m.es.Count().Index(m.indexName).Request(&count.Request{
 		Query: &types.Query{

diff --git a/biz/infrastructure/mapper/post/es.go b/biz/infrastructure/mapper/post/es.go
@@ -16,7 +16,9 @@ import (
 	"github.com/mitchellh/mapstructure"
 	"github.com/xh-polaris/gopkg/pagination"
 	"github.com/xh-polaris/gopkg/pagination/esp"
+	"github.com/zeromicro/go-zero/core/trace"
 	"go.mongodb.org/mongo-driver/bson/primitive"
+	oteltrace "go.opentelemetry.io/otel/trace"
 
 	"github.com/xh-polaris/meowchat-content/biz/infrastructure/config"
 	"github.com/xh-polaris/meowchat-content/biz/infrastructure/consts"
@@ -53,6 +55,10 @@ func NewEsMapper(config *config.Config) IEsMapper {
 }
 
 func (m *EsMapper) CountWithQuery(ctx context.Context, query []types.Query, fopts *FilterOptions) (int64, error) {
+	ctx, span := trace.TracerFromContext(ctx).Start(ctx, "elasticsearch/Count", oteltrace.WithTimestamp(time.Now()), oteltrace.WithSpanKind(oteltrace.SpanKindClient))
+	defer func() {
+		span.End(oteltrace.WithTimestamp(time.Now()))
+	}()
 	filter := newPostFilter(fopts)
 	res, err := m.es.Count().Index(m.indexName).Request(&count.Request{
 		Query: &types.Query{
@@ -70,6 +76,10 @@ func (m *EsMapper) CountWithQuery(ctx context.Context, query []types.Query, fopt
 }
 
 func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *FilterOptions, popts *pagination.PaginationOptions, sorter esp.EsCursor) ([]*Post, int64, error) {
+	ctx, span := trace.TracerFromContext(ctx).Start(ctx, "elasticsearch/Search", oteltrace.WithTimestamp(time.Now()), oteltrace.WithSpanKind(oteltrace.SpanKindClient))
+	defer func() {
+		span.End(oteltrace.WithTimestamp(time.Now()))
+	}()
 	p := esp.NewEsPaginator(pagination.NewRawStore(sorter), popts)
 	filter := newPostFilter(fopts)
 	s, sa, err := p.MakeSortOptions(ctx)