Skip to content
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

[logzioexporter] Remove dependency on jaeger dbmodel #36972

Merged
merged 10 commits into from
Jan 7, 2025

Conversation

zzzk1
Copy link
Contributor

@zzzk1 zzzk1 commented Dec 27, 2024

Description

Copy the Jaeger plugin/storage/es/spanstore/dbmodel for logzioexporter, and remove the dependency. The dbmodel package in Jaeger will be internal from v1.65 (jaegertracing/jaeger#6428).

Link to tracking issue

Fixes #36970

Testing

Covered by existing

yurishkuro pushed a commit to jaegertracing/jaeger that referenced this pull request Dec 27, 2024
## Which problem is this PR solving?
- Resolves #6410
- Prerequisite:
open-telemetry/opentelemetry-collector-contrib#36972

## Description of the changes
- move plugin/storage/es/spanstore/dbmodel to
plugin/storage/es/spanstore/internal/dbmodel

## How was this change tested?
- 

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [ ] 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: zzzk1 <[email protected]>
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, but code owners need to sign off -- @yotamloe

Copy link
Contributor

@fatsheep9146 fatsheep9146 left a comment

Choose a reason for hiding this comment

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

Please add a changelog.

@zzzk1
Copy link
Contributor Author

zzzk1 commented Dec 29, 2024

@fatsheep9146 @yurishkuro @yotamloe Improved, please take a look 😊

exporter/logzioexporter/from_domain.go Outdated Show resolved Hide resolved
exporter/logzioexporter/logziospan.go Outdated Show resolved Hide resolved
@yurishkuro yurishkuro changed the title [exporter] Remove jaeger dbmodel dependency [logzioexporter] Remove jaeger dbmodel dependency Jan 4, 2025
@yurishkuro yurishkuro changed the title [logzioexporter] Remove jaeger dbmodel dependency [logzioexporter] Remove dependency on jaeger dbmodel Jan 4, 2025
Copy link
Contributor

@yotamloe yotamloe left a comment

Choose a reason for hiding this comment

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

@zzzk1 Thank you for your contribution!

@atoulme atoulme added the ready to merge Code review completed; ready to merge by maintainers label Jan 4, 2025
Manik2708 pushed a commit to Manik2708/jaeger that referenced this pull request Jan 5, 2025
…g#6428)

- Resolves jaegertracing#6410
- Prerequisite:
open-telemetry/opentelemetry-collector-contrib#36972

- move plugin/storage/es/spanstore/dbmodel to
plugin/storage/es/spanstore/internal/dbmodel

-

- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [ ] 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: zzzk1 <[email protected]>
@andrzej-stencel andrzej-stencel merged commit 5641945 into open-telemetry:main Jan 7, 2025
173 of 175 checks passed
@github-actions github-actions bot added this to the next release milestone Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
exporter/logzio ready to merge Code review completed; ready to merge by maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Eliminate logziospan dependency on the plugin/storage/es/spanstore/dbmodel
7 participants