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

Add TraceTTL to cassandra schema spec #1111

Merged

Conversation

moolen
Copy link
Contributor

@moolen moolen commented Jul 1, 2020

This adds the CassandraSchemaSpec.traceTTL field to allow the user to specify the TTL for their traces.
The TRACE_TTL env var is picked up by this script which creates the schema: https://github.com/jaegertracing/jaeger/blob/master/plugin/storage/cassandra/schema/create.sh

fixes #1101

@codecov
Copy link

codecov bot commented Jul 1, 2020

Codecov Report

Merging #1111 into master will increase coverage by 0.04%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1111      +/-   ##
==========================================
+ Coverage   88.00%   88.05%   +0.04%     
==========================================
  Files          86       86              
  Lines        5254     5274      +20     
==========================================
+ Hits         4624     4644      +20     
  Misses        466      466              
  Partials      164      164              
Impacted Files Coverage Δ
pkg/apis/jaegertracing/v1/jaeger_types.go 100.00% <ø> (ø)
pkg/storage/cassandra_dependencies.go 100.00% <100.00%> (ø)
pkg/config/ca/ca.go 100.00% <0.00%> (ø)
pkg/inject/sidecar.go 94.38% <0.00%> (+0.20%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e7ad3f0...429ad55. Read the comment docs.

@moolen moolen force-pushed the feat/cassandra-add-trace-ttl branch from a89b85e to 73ccd7c Compare July 2, 2020 06:26
@moolen
Copy link
Contributor Author

moolen commented Jul 2, 2020

The es-otel test seems flaky, it runs fine locally. Can i re-run this check individually without git commit --amend and force-pushing?

pkg/apis/jaegertracing/v1/jaeger_types.go Outdated Show resolved Hide resolved
@jpkrohling
Copy link
Contributor

LGTM. @kevinearls, is this ES failure known to you? If so, we can merge this as is, or we can try to restart the job via GitHub (which typically will cause everything to randomly fail...). Or, @moolen could try to amend and force-push and see if the test passes :-/

@moolen moolen force-pushed the feat/cassandra-add-trace-ttl branch from 73ccd7c to 9d43795 Compare July 2, 2020 15:17
@kevinearls
Copy link
Contributor

@jpkrohling which es failure?

@moolen moolen force-pushed the feat/cassandra-add-trace-ttl branch from 9d43795 to cf09a6e Compare July 2, 2020 15:45
@moolen
Copy link
Contributor Author

moolen commented Jul 2, 2020

I take that back, i don't think it's flaky: I reproduced the issue locally (i missed exporting the USE_OTEL_COLLECTOR env var before running es tests) and it continuously fails in CI. I'll dig into that.
stacktrace of the pod that runs jaegertracing/spark-dependencies : https://gist.github.com/moolen/091b62d537bab7f01c9f8072ad6d19a2

@jpkrohling
Copy link
Contributor

If you nee any help, let us know!

@@ -431,16 +431,33 @@ type JaegerCassandraCreateSchemaSpec struct {
// +optional
Enabled *bool `json:"enabled,omitempty"`

// Image specifies the docker container to use to create the cassandra schema.
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, not docker container but container image :)

Copy link
Contributor

Choose a reason for hiding this comment

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

This is not a blocker, though. Would you prefer me to merge this as is, or would you want to get this change in ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, what a misunderstanding :D I'll fix that for sure!

fixes jaegertracing#1101

Signed-off-by: Moritz Johner <beller.moritz@googlemail.com>
@moolen moolen force-pushed the feat/cassandra-add-trace-ttl branch from cf09a6e to 429ad55 Compare July 3, 2020 10:13
@jpkrohling jpkrohling merged commit 9cde42a into jaegertracing:master Jul 3, 2020
@jpkrohling
Copy link
Contributor

Thank you for your contribution!

@moolen moolen deleted the feat/cassandra-add-trace-ttl branch July 3, 2020 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow TRACE_TTL to be defined in cassandraCreateSchema
3 participants