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

Fix batchProcessor to set correct span format flags #4796

Merged

Conversation

k0zl
Copy link
Contributor

@k0zl k0zl commented Oct 2, 2023

Which problem is this PR solving?

Recently I've noticed that collector sends wrong tags "format" and "transport" in metric jaeger_collector_spans_received_total.

Root cause: when batchProcessor was extended to be called from OTLP Receiver, it was given SpanOptions parameter that could specify a different span format OTLP, vs. always setting Proto. But the processor was still using hardcoded Proto format when invoking the next processor.

How was this change tested?

Added unit test

Checklist

@k0zl k0zl requested a review from a team as a code owner October 2, 2023 10:17
@k0zl k0zl requested a review from jkowall October 2, 2023 10:17
albertteoh
albertteoh previously approved these changes Oct 2, 2023
Copy link
Contributor

@albertteoh albertteoh left a comment

Choose a reason for hiding this comment

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

Thanks! Please sign your commit.

@k0zl
Copy link
Contributor Author

k0zl commented Oct 2, 2023

Thanks! Please sign your commit.

Yep, already did

@codecov
Copy link

codecov bot commented Oct 2, 2023

Codecov Report

All modified lines are covered by tests ✅

Files Coverage Δ
cmd/collector/app/handler/grpc_handler.go 100.00% <100.00%> (ø)

📢 Thoughts on this report? Let us know!.

@k0zl k0zl force-pushed the Fix-proto-label-in-collector-metrics branch from 1e9f689 to 42ef373 Compare October 2, 2023 10:39
@k0zl
Copy link
Contributor Author

k0zl commented Oct 2, 2023

@albertteoh could you approve the required workflows please?

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.

please add unit test that illustrates the issue

@k0zl k0zl force-pushed the Fix-proto-label-in-collector-metrics branch from fd50c2b to 5e61d08 Compare October 17, 2023 08:46
@k0zl
Copy link
Contributor Author

k0zl commented Oct 17, 2023

Added unit test

@k0zl k0zl requested a review from yurishkuro October 17, 2023 14:20
yurishkuro
yurishkuro previously approved these changes Oct 17, 2023
@yurishkuro yurishkuro enabled auto-merge (squash) October 17, 2023 20:23
Signed-off-by: Yuri Shkuro <[email protected]>
…l/jaeger into Fix-proto-label-in-collector-metrics

Signed-off-by: Yuri Shkuro <[email protected]>
@yurishkuro yurishkuro changed the title Fixed bug with incorrect metric tags Fix batchProcessor to set correct span format flags Oct 17, 2023
@yurishkuro yurishkuro enabled auto-merge (squash) October 17, 2023 21:21
@yurishkuro yurishkuro merged commit 6919fd7 into jaegertracing:main Oct 17, 2023
32 checks passed
@yurishkuro
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants