Skip to content

Upgrade storage integration test: use TraceWriter#6437

Merged
yurishkuro merged 18 commits intojaegertracing:mainfrom
ekefan:update-spanWriter
Jan 2, 2025
Merged

Upgrade storage integration test: use TraceWriter#6437
yurishkuro merged 18 commits intojaegertracing:mainfrom
ekefan:update-spanWriter

Conversation

@ekefan
Copy link
Copy Markdown
Contributor

@ekefan ekefan commented Dec 28, 2024 •
edited
Loading

Which problem is this PR solving?

Description of the changes

  • Incrementally swaps the fields of StorageIntegration to align with v2 storage api while supporting v1 api
    • replaced SpanWriter with TraceWriter
  • Updates test functions accordingly to work with the updated fields

How was this change tested?

  • CI

Checklist

@ekefan ekefan requested a review from a team as a code owner December 28, 2024 15:20
@ekefan ekefan requested a review from pavolloffay December 28, 2024 15:20
@codecov
Copy link
Copy Markdown

codecov bot commented Dec 28, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.29%. Comparing base (244b759) to head (1559b2c).
Report is 1 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #6437      +/-   ##
==========================================
- Coverage   96.30%   96.29%   -0.02%     
==========================================
  Files         371      371              
  Lines       21160    21173      +13     
==========================================
+ Hits        20379    20389      +10     
- Misses        598      600       +2     
- Partials      183      184       +1
Flag Coverage Δ
badger_v1 10.74% <76.92%> (+0.23%) ⬆️
badger_v2 2.80% <76.92%> (+0.21%) ⬆️
cassandra-4.x-v1-manual 16.62% <76.92%> (+0.25%) ⬆️
cassandra-4.x-v2-auto 2.73% <76.92%> (+0.21%) ⬆️
cassandra-4.x-v2-manual 2.73% <76.92%> (+0.21%) ⬆️
cassandra-5.x-v1-manual 16.62% <76.92%> (+0.25%) ⬆️
cassandra-5.x-v2-auto 2.73% <76.92%> (+0.21%) ⬆️
cassandra-5.x-v2-manual 2.73% <76.92%> (+0.21%) ⬆️
elasticsearch-6.x-v1 20.31% <76.92%> (+0.21%) ⬆️
elasticsearch-7.x-v1 20.38% <76.92%> (+0.21%) ⬆️
elasticsearch-8.x-v1 20.55% <76.92%> (+0.21%) ⬆️
elasticsearch-8.x-v2 2.79% <76.92%> (+0.21%) ⬆️
grpc_v1 12.38% <76.92%> (+0.22%) ⬆️
grpc_v2 9.15% <76.92%> (+0.20%) ⬆️
kafka-3.x-v1 10.58% <76.92%> (+0.23%) ⬆️
kafka-3.x-v2 2.80% <76.92%> (+0.21%) ⬆️
memory_v2 2.80% <76.92%> (+0.21%) ⬆️
opensearch-1.x-v1 20.43% <76.92%> (+0.21%) ⬆️
opensearch-2.x-v1 20.43% <76.92%> (+0.21%) ⬆️
opensearch-2.x-v2 2.79% <76.92%> (+0.21%) ⬆️
tailsampling-processor 0.52% <0.00%> (+0.12%) ⬆️
unittests 95.16% <100.00%> (-0.02%) ⬇️

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.

yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
@ekefan ekefan changed the title Upgrade storage integration test, use TraceWriter Upgrade storage integration test: use TraceWriter Dec 28, 2024
yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
@yurishkuro yurishkuro added the changelog:ci Change related to continuous integration / testing label Dec 28, 2024
yurishkuro
yurishkuro reviewed Dec 28, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@yurishkuro yurishkuro left a comment •
edited
Loading

Choose a reason for hiding this comment

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

lgtm, with some small nits. Also please check why CI is not green.

@ekefan
Copy link
Copy Markdown
Contributor Author

ekefan commented Dec 29, 2024 •
edited
Loading

lgtm, with some small nits. Also please check why CI is not green.

For otlp_json encoding, kafka test fails to get large spans.
With console logs, I discovered that no traces are found when trying to read...

I'm trying to figure it out why

@yurishkuro
Copy link
Copy Markdown
Member

yurishkuro commented Dec 29, 2024

I found this error
2024-12-29T12:34:09.540-0500 info internal/retry_sender.go:126 Exporting failed. Will retry the request after interval. {"kind": "exporter", "data_type": "traces", "name": "kafka", "error": "Failed to deliver 1 messages due to kafka: invalid configuration (Attempt to produce message larger than configured Producer.MaxMessageBytes: 3052630 > 1000000)", "interval": "30.935639755s"}

I'd call this a bug in OTEL Kafka exporter, it is not respecting the max message size for Kafka. In other words, if for whatever reason the collector received a very large payload and accepted it, the exporter should not be failing to export it just because it's large, it should try to split the payload into chunks that are of acceptable size.

For the purpose of this PR ww can probably just increase this parameter to 3MB (but I am not sure if Kafka's internal configuration also needs to be increased). Alternatively we can change the e2e test to not send the whole trace all at once, but break it into say 1000-span chunks. The ideal fix would be to correct OTEL kafkaexporter to respect the message size.

@ekefan
Copy link
Copy Markdown
Contributor Author

ekefan commented Dec 29, 2024 •
edited
Loading

For the purpose of this PR ww can probably just increase this parameter to 3MB (but I am not sure if Kafka's internal configuration also needs to be increased). Alternatively we can change the e2e test to not send the whole trace all at once, but break it into say 1000-span chunks. The ideal fix would be to correct OTEL kafkaexporter to respect the message size.

for the alternative solution, it is at this point

func (w *traceWriter) WriteTraces(ctx context.Context, td ptrace.Traces) error {
        // create chunks of trace if span count > 1000
	return w.exporter.ConsumeTraces(ctx, td)
}

I have a question please:

  • Why doesn't this exporter return an error saying it can write a trace with that many spans?

@yurishkuro
Copy link
Copy Markdown
Member

yurishkuro commented Dec 29, 2024

Good question. It's because there is no error when it does export - it sends the payload to OTLP receiver in the collector which accepts it and passes down the pipeline. In the pipeline we have a batch processor that always responds without an error because it groups the spans and then sends then in the background, at which point the error happens but there's no place to report it except for logs. It's a flaw in the OTEL collector batch processor - it could've been implemented to be able to return the error to all clients whose payload failed to be exported in a batch.

@yurishkuro
Copy link
Copy Markdown
Member

yurishkuro commented Dec 29, 2024

And yes, in the writeTrace function we can split a trace into several chunks.

This was referenced Dec 29, 2024
Open
Open
@yurishkuro
Copy link
Copy Markdown
Member

yurishkuro commented Dec 29, 2024

I booked a ticket #6439 to have a proper fix upstream, but meanwhile we can fix writeTrace to unblock this work.

yurishkuro
yurishkuro reviewed Jan 1, 2025
View reviewed changes
ekefan added 4 commits January 1, 2025 23:35
@ekefan
Use TraceWriter for each storage implementation
820c28d 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Adjust test functions to use TraceWriter
16d8b83 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Convert model traces to otel traces
231565e 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Return spanstore.Writer from wrapper
1fb8cc9 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan ekefan force-pushed the update-spanWriter branch from 03b059d to 9ce3f14 Compare January 1, 2025 22:44
ekefan added 13 commits January 1, 2025 23:46
@ekefan
Resolve merge conflict
cb852e7 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Update e2e storage integration to use traceWriter
c61926c 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Fix: V1TraceToOtelTrace
d94fa79 
- use standard for traces
- upgrade test for `V1TraceToOtelTrace`

Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Fix lint error
26c8828 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Fix: `v1TraceToOtelTrace
f874326 
- upgrade test
- improve function structure

Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Chunk Traces for exporting in e2e storage integration
d867a7f 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Fix: make fmt adjustments
d781896 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Fix Lint errors
bf1c329 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Chunk Traces with jptrace.SpanIter
8369e8c 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Write Traces in Chunks
25f0cc9 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Adjust WriteTraces and writeTraceInChunks
cda5392 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Use better naming
7803c56 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan
Fix merge conflict
861eea1 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
@ekefan ekefan force-pushed the update-spanWriter branch from 9ce3f14 to 861eea1 Compare January 1, 2025 22:55
@ekefan
Adjust Write Traces
1559b2c 
Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
yurishkuro
yurishkuro reviewed Jan 2, 2025
View reviewed changes
cmd/jaeger/internal/integration/trace_writer_test.go
Comment on lines +57 to +63
// Add span1 and span2
scope1 := resources.At(0).ScopeSpans().At(0)
for i := 1; i <= 2; i++ {
span := scope1.Spans().AppendEmpty()
span.SetSpanID(pcommon.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, byte(i)}))
span.SetName(fmt.Sprintf("span%d", i))
}
Copy link
Copy Markdown
Member

@yurishkuro yurishkuro Jan 2, 2025

Choose a reason for hiding this comment

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

why not do this in the same loop at L54?

Copy link
Copy Markdown
Contributor Author

@ekefan ekefan Jan 2, 2025

Choose a reason for hiding this comment

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

I wanted it to be explicit that scope1 and scope3 have two spans while scope 2 has one only

@yurishkuro yurishkuro merged commit 83b64d6 into jaegertracing:main Jan 2, 2025
@yurishkuro
Copy link
Copy Markdown
Member

yurishkuro commented Jan 2, 2025

Thanks

@yurishkuro yurishkuro mentioned this pull request Jan 2, 2025
Closed
6 tasks
@ekefan ekefan deleted the update-spanWriter branch January 2, 2025 00:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yurishkuro yurishkuro yurishkuro left review comments

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

Assignees

No one assigned

Labels

area/storage changelog:ci Change related to continuous integration / testing v2

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ekefan @yurishkuro