From 692eb0e30a24071932b9e2007ddcf0233a5d8d62 Mon Sep 17 00:00:00 2001 From: Manik2708 Date: Sun, 26 Jan 2025 16:30:51 +0530 Subject: [PATCH] conflicts Signed-off-by: Manik2708 --- plugin/storage/es/spanstore/service_operation.go | 2 +- plugin/storage/es/spanstore/service_operation_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/storage/es/spanstore/service_operation.go b/plugin/storage/es/spanstore/service_operation.go index a8877eb145f..bc82536607c 100644 --- a/plugin/storage/es/spanstore/service_operation.go +++ b/plugin/storage/es/spanstore/service_operation.go @@ -16,7 +16,7 @@ import ( "github.com/olivere/elastic" "go.uber.org/zap" - "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger-idl/model/v1" "github.com/jaegertracing/jaeger/pkg/cache" "github.com/jaegertracing/jaeger/pkg/es" "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel" diff --git a/plugin/storage/es/spanstore/service_operation_test.go b/plugin/storage/es/spanstore/service_operation_test.go index 8cc790d3ad9..ebe958ec851 100644 --- a/plugin/storage/es/spanstore/service_operation_test.go +++ b/plugin/storage/es/spanstore/service_operation_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger-idl/model/v1" "github.com/jaegertracing/jaeger/pkg/es/mocks" "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/storage/spanstore"