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

[chore][tests] Clean up integration tests to remove archive reader / writer #6625

Merged
merged 4 commits into from
Jan 29, 2025

Conversation

mahadzaryab1
Copy link
Collaborator

@mahadzaryab1 mahadzaryab1 commented Jan 27, 2025

Which problem is this PR solving?

Description of the changes

  • This PR cleans up the integration test suite for jaeger-v1 by removing the archive related fields for all tests since they were being skipped anyway, with the exception of elasticsearch.
  • Since the only storage that has a difference between primary and archive storage is ElasticSearch, this PR moves the archive trace test to elasticsearch_test.go.

How was this change tested?

  • CI

Checklist

Comment on lines -70 to -77
af := s.initializeCassandraFactory(t, []string{
"--cassandra-archive.keyspace=jaeger_v1_dc1_archive",
"--cassandra-archive.enabled=true",
"--cassandra-archive.servers=127.0.0.1",
"--cassandra-archive.basic.allowed-authenticators=org.apache.cassandra.auth.PasswordAuthenticator",
"--cassandra-archive.password=" + password,
"--cassandra-archive.username=" + username,
}, cassandra.NewArchiveFactory)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@yurishkuro thoughts on keeping vs removing this? we were initializing the archive span reader / writer but never actual ran the archive test

Copy link
Member

Choose a reason for hiding this comment

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

ok

@mahadzaryab1 mahadzaryab1 added the changelog:ci Change related to continuous integration / testing label Jan 27, 2025
Copy link

codecov bot commented Jan 27, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.92%. Comparing base (9d3a516) to head (0305cf2).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6625      +/-   ##
==========================================
- Coverage   95.97%   95.92%   -0.06%     
==========================================
  Files         365      365              
  Lines       20616    20616              
==========================================
- Hits        19787    19776      -11     
- Misses        630      640      +10     
- Partials      199      200       +1     
Flag Coverage Δ
badger_v1 9.92% <ø> (ø)
badger_v2 1.84% <ø> (ø)
cassandra-4.x-v1-manual 14.93% <ø> (-0.16%) ⬇️
cassandra-4.x-v2-auto 1.83% <ø> (ø)
cassandra-4.x-v2-manual 1.83% <ø> (ø)
cassandra-5.x-v1-manual 14.93% <ø> (-0.16%) ⬇️
cassandra-5.x-v2-auto 1.83% <ø> (ø)
cassandra-5.x-v2-manual 1.83% <ø> (ø)
elasticsearch-6.x-v1 19.30% <ø> (ø)
elasticsearch-7.x-v1 19.38% <ø> (ø)
elasticsearch-8.x-v1 19.56% <ø> (ø)
elasticsearch-8.x-v2 1.84% <ø> (ø)
grpc_v1 10.90% <ø> (-0.15%) ⬇️
grpc_v2 7.89% <ø> (ø)
kafka-3.x-v1 10.21% <ø> (ø)
kafka-3.x-v2 1.84% <ø> (ø)
memory_v2 1.84% <ø> (ø)
opensearch-1.x-v1 19.44% <ø> (ø)
opensearch-2.x-v1 19.44% <ø> (ø)
opensearch-2.x-v2 1.84% <ø> (ø)
tailsampling-processor 0.48% <ø> (ø)
unittests 94.80% <ø> (+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.

tID := model.NewTraceID(uint64(11), uint64(22))
expected := &model.Span{
OperationName: "archive_span",
StartTime: time.Now().Add(-maxSpanAge * 5).Truncate(time.Microsecond),
Copy link
Member

Choose a reason for hiding this comment

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

maxSpanAge is a constant in this file, but it is not passed as a configuration to the storage factory

Copy link
Member

Choose a reason for hiding this comment

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

let's add in a separate PR

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

I know, but it's disassociated from that default. We should pass max age as parameter to the factory here.

@yurishkuro yurishkuro merged commit 4ac036b into jaegertracing:main Jan 29, 2025
55 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/storage changelog:ci Change related to continuous integration / testing storage/elasticsearch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants