Skip to content

[es] Refactor the ES SpanWriter to make it reusable for v2 APIs #6796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 14 commits into from
Mar 6, 2025
Merged

[es] Refactor the ES SpanWriter to make it reusable for v2 APIs #6796

merged 14 commits into from
Mar 6, 2025

Conversation

Manik2708
Copy link
Contributor

@Manik2708 Manik2708 commented Mar 3, 2025 •
edited
Loading

Which problem is this PR solving?

Fixes a part of #6458

Description of the changes

  • The JsonSpanWriter accepts the json span instead of jaeger span which makes it reusabe in v2 storage APIs

How was this change tested?

  • Unit Tests

Checklist

@Manik2708
[es] Refactored the ES Span to make it reusable for v2 APIs
6f826da 
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708 Manik2708 requested a review from a team as a code owner March 3, 2025 20:02
@Manik2708 Manik2708 requested a review from albertteoh March 3, 2025 20:02
@Manik2708
Copy link
Contributor Author

@mahadzaryab1 @yurishkuro I am bit confused for the directory structure of model. I have kept it in pkg/es, should I create a new package inside pkg/es for it?

yurishkuro
yurishkuro reviewed Mar 3, 2025
View reviewed changes
@codecov Codecov
Copy link

codecov bot commented Mar 3, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.04%. Comparing base (2c5cdc9) to head (fdb4ced).
Report is 1 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #6796   +/-   ##
=======================================
  Coverage   96.03%   96.04%           
=======================================
  Files         364      364           
  Lines       20702    20712   +10     
=======================================
+ Hits        19882    19892   +10     
  Misses        626      626           
  Partials      194      194
Flag Coverage Δ
badger_v1 9.86% <0.00%> (-0.01%) ⬇️
badger_v2 1.98% <0.00%> (-0.01%) ⬇️
cassandra-4.x-v1-manual 14.87% <0.00%> (-0.02%) ⬇️
cassandra-4.x-v2-auto 1.97% <0.00%> (-0.01%) ⬇️
cassandra-4.x-v2-manual 1.97% <0.00%> (-0.01%) ⬇️
cassandra-5.x-v1-manual 14.87% <0.00%> (-0.02%) ⬇️
cassandra-5.x-v2-auto 1.97% <0.00%> (-0.01%) ⬇️
cassandra-5.x-v2-manual 1.97% <0.00%> (-0.01%) ⬇️
elasticsearch-6.x-v1 19.26% <87.50%> (+0.06%) ⬆️
elasticsearch-7.x-v1 19.34% <87.50%> (+0.06%) ⬆️
elasticsearch-8.x-v1 19.51% <87.50%> (+0.06%) ⬆️
elasticsearch-8.x-v2 1.98% <0.00%> (-0.01%) ⬇️
grpc_v1 10.90% <0.00%> (-0.02%) ⬇️
grpc_v2 7.95% <0.00%> (-0.01%) ⬇️
kafka-3.x-v1 10.16% <0.00%> (-0.02%) ⬇️
kafka-3.x-v2 1.98% <0.00%> (-0.01%) ⬇️
memory_v2 1.98% <0.00%> (-0.01%) ⬇️
opensearch-1.x-v1 19.39% <87.50%> (+0.06%) ⬆️
opensearch-2.x-v1 19.39% <87.50%> (+0.06%) ⬆️
opensearch-2.x-v2 1.98% <0.00%> (-0.01%) ⬇️
tailsampling-processor 0.48% <0.00%> (-0.01%) ⬇️
unittests 94.93% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Manik2708 added 2 commits March 4, 2025 11:29
@Manik2708
Revert "[es] Refactored the ES Span to make it reusable for v2 APIs"
8bc8085 
This reverts commit 6f826da.

Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708
[es] Refactored the ES SpanWriter to make it reusable for v2 APIs
573edfe 
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708 Manik2708 changed the title [es] Refactored the ES Span to make it reusable for v2 APIs [es] Refactored the ES SpanWriter to make it reusable for v2 APIs Mar 4, 2025
@Manik2708 Manik2708 requested a review from yurishkuro March 4, 2025 06:36
@Manik2708
Copy link
Contributor Author

@yurishkuro I have refactored with the way you said. Please review, once the apporach here is approved, same will be repeated for reader. But one thing which I want to ask is should we include CreateTemplates in JsonSpanWriter also? As it will also be needed in v2 APIs.

Manik2708 added 3 commits March 4, 2025 12:22
@Manik2708
err removed
78ef65f 
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708
more cleaning
68b066f 
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708
Merge branch 'main' into es-writer
7beea1f
yurishkuro
yurishkuro reviewed Mar 5, 2025
View reviewed changes
Manik2708 added 4 commits March 6, 2025 15:45
@Manik2708
Revert "more cleaning"
44db806 
This reverts commit 68b066f.

Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708
cleaning
9645a6b 
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708
Merge branch 'main' into es-writer
e4e89f2
@Manik2708
cleaning
16edef9 
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708 Manik2708 requested a review from yurishkuro March 6, 2025 10:18
@Manik2708
Copy link
Contributor Author

@yurishkuro Does the new changes make sense?

Manik2708 added 2 commits March 7, 2025 00:45
@Manik2708
SpanWriterV1
2f0cc26 
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708
Merge branch 'main' into es-writer
2bccaee
Manik2708
Manik2708 commented Mar 6, 2025
View reviewed changes
Manik2708
Manik2708 commented Mar 6, 2025
View reviewed changes
yurishkuro
yurishkuro reviewed Mar 6, 2025
View reviewed changes
Manik2708 added 2 commits March 7, 2025 01:27
@Manik2708
cleaning
b3632d6 
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708
cleaning
fdb4ced 
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
yurishkuro
yurishkuro approved these changes Mar 6, 2025
View reviewed changes
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@yurishkuro yurishkuro changed the title [es] Refactored the ES SpanWriter to make it reusable for v2 APIs [es] Refactor the ES SpanWriter to make it reusable for v2 APIs Mar 6, 2025
@yurishkuro yurishkuro enabled auto-merge March 6, 2025 20:21
@yurishkuro yurishkuro added this pull request to the merge queue Mar 6, 2025
Merged via the queue into jaegertracing:main with commit ccc61f1 Mar 6, 2025
56 of 57 checks passed
Asatyam pushed a commit to Asatyam/jaeger that referenced this pull request Mar 9, 2025
@Manik2708 @Asatyam
[es] Refactor the ES SpanWriter to make it reusable for v2 APIs (jaeg…
50c7e4c 
…ertracing#6796)

## Which problem is this PR solving?
Fixes a part of jaegertracing#6458 

## Description of the changes
- The JsonSpanWriter accepts the json span instead of jaeger span which
makes it reusabe in v2 storage APIs

## How was this change tested?
- Unit Tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
@Manik2708 Manik2708 deleted the es-writer branch March 19, 2025 09:08
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
@Manik2708 @amol-verma-allen
[es] Refactor the ES SpanWriter to make it reusable for v2 APIs (jaeg…
a161fd2 
…ertracing#6796)

## Which problem is this PR solving?
Fixes a part of jaegertracing#6458

## Description of the changes
- The JsonSpanWriter accepts the json span instead of jaeger span which
makes it reusabe in v2 storage APIs

## How was this change tested?
- Unit Tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
Signed-off-by: amol-verma-allen <amol.verma@allen.in>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yurishkuro yurishkuro yurishkuro approved these changes

@albertteoh albertteoh Awaiting requested review from albertteoh albertteoh is a code owner automatically assigned from jaegertracing/jaeger-maintainers

Assignees
No one assigned
Labels
area/storage changelog:bugfix-or-minor-feature storage/elasticsearch v2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Manik2708 @yurishkuro