Skip to content

[ES][v2] Change the DB Tag value from string to any type #6994

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.

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

Merged
merged 1 commit into from
Apr 10, 2025

Conversation

Manik2708
Copy link
Contributor

Which problem is this PR solving?

Fixes a part of: #6458

Description of the changes

How was this change tested?

  • Unit Tests

Checklist

Copy link

codecov bot commented Apr 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.98%. Comparing base (8d8f7e2) to head (a953467).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6994      +/-   ##
==========================================
- Coverage   95.98%   95.98%   -0.01%     
==========================================
  Files         346      346              
  Lines       20552    20587      +35     
==========================================
+ Hits        19727    19760      +33     
- Misses        622      624       +2     
  Partials      203      203              
Flag Coverage Δ
badger_v1 10.48% <ø> (ø)
badger_v2 2.17% <ø> (ø)
cassandra-4.x-v1-manual 15.77% <ø> (ø)
cassandra-4.x-v2-auto 2.16% <ø> (ø)
cassandra-4.x-v2-manual 2.16% <ø> (ø)
cassandra-5.x-v1-manual 15.77% <ø> (ø)
cassandra-5.x-v2-auto 2.16% <ø> (ø)
cassandra-5.x-v2-manual 2.16% <ø> (ø)
elasticsearch-6.x-v1 20.87% <ø> (ø)
elasticsearch-7.x-v1 20.95% <ø> (ø)
elasticsearch-8.x-v1 21.13% <ø> (ø)
elasticsearch-8.x-v2 2.17% <ø> (ø)
grpc_v1 11.56% <ø> (ø)
grpc_v2 8.43% <ø> (ø)
kafka-3.x-v1 10.77% <ø> (ø)
kafka-3.x-v2 2.17% <ø> (ø)
memory_v2 2.17% <ø> (ø)
opensearch-1.x-v1 21.00% <ø> (ø)
opensearch-2.x-v1 21.00% <ø> (ø)
opensearch-2.x-v2 2.17% <ø> (ø)
tailsampling-processor 0.59% <ø> (ø)
unittests 94.78% <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
Copy link
Contributor Author

/Don't Merge Firstly let the #6998 get merged, there are some changes which will be required in this PR after analaysing the integration tests!

github-merge-queue bot pushed a commit that referenced this pull request Apr 10, 2025
## Which problem is this PR solving?
- Discussed in #6994 

## Description of the changes
- We shouldn't be storing values as string in ES rather they should be
stored raw but due to some unkown reason they were being stored as
string so now backward compatibility should be considered for the old
data and new data should be stored as raw

## How was this change tested?
- Unit and E2E 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 <[email protected]>
@Manik2708
Copy link
Contributor Author

@yurishkuro From the PR: #6998 we got to know from integration tests that when span is extracted from ES, number is extracted as json.Number, so we need to consider three cases when we are dealing int64 when it is actually int64, when it is float64 and last one when it is a json.Number. Similarly 2 cases for float! Please review if it is good to go!

@Manik2708 Manik2708 marked this pull request as draft April 10, 2025 16:05
Signed-off-by: Manik2708 <[email protected]>
@Manik2708 Manik2708 marked this pull request as ready for review April 10, 2025 17:13
@yurishkuro yurishkuro added the changelog:exprimental Change to an experimental part of the code label Apr 10, 2025
@yurishkuro yurishkuro enabled auto-merge April 10, 2025 23:16
@yurishkuro yurishkuro added this pull request to the merge queue Apr 10, 2025
Merged via the queue into jaegertracing:main with commit 6c5d0f3 Apr 10, 2025
56 of 58 checks passed
AnmolxSingh pushed a commit to AnmolxSingh/jaeger that referenced this pull request Apr 11, 2025
…racing#6994)

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

## Description of the changes
- As discussed in jaegertracing#6946 we need to change the value which was saved as
string in v1 to a raw value in v2

## 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 <[email protected]>
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
…racing#6998)

## Which problem is this PR solving?
- Discussed in jaegertracing#6994 

## Description of the changes
- We shouldn't be storing values as string in ES rather they should be
stored raw but due to some unkown reason they were being stored as
string so now backward compatibility should be considered for the old
data and new data should be stored as raw

## How was this change tested?
- Unit and E2E 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 <[email protected]>
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
…racing#6994)

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

## Description of the changes
- As discussed in jaegertracing#6946 we need to change the value which was saved as
string in v1 to a raw value in v2

## 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 <[email protected]>
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
…racing#6998)

## Which problem is this PR solving?
- Discussed in jaegertracing#6994

## Description of the changes
- We shouldn't be storing values as string in ES rather they should be
stored raw but due to some unkown reason they were being stored as
string so now backward compatibility should be considered for the old
data and new data should be stored as raw

## How was this change tested?
- Unit and E2E 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 <[email protected]>
Signed-off-by: amol-verma-allen <[email protected]>
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
…racing#6994)

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

## Description of the changes
- As discussed in jaegertracing#6946 we need to change the value which was saved as
string in v1 to a raw value in v2

## 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 <[email protected]>
Signed-off-by: amol-verma-allen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants