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.

Sign up for GitHub

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

Jump to bottom

Add Zipkin support of OpenSearch storage (add Docker images) #3766

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Add Zipkin support of OpenSearch storage (add Docker images) #3766

merged 2 commits into from
Apr 30, 2024

Conversation

reta
Copy link
Contributor

@reta reta commented Apr 19, 2024 •
edited
Loading

Add Zipkin support of OpenSearch storage (add Docker images) as dicussed #3765 (comment)

@reta reta force-pushed the issue-3753-docker branch 4 times, most recently from 83972b4 to f5d1ca3 Compare April 20, 2024 01:48
@codefromthecrypt
Copy link
Member

the cve is eureka. I'll help raise a PR https://github.com/openzipkin/zipkin/actions/runs/8761712611?pr=3766

@reta reta force-pushed the issue-3753-docker branch from f5d1ca3 to 6db6654 Compare April 30, 2024 01:33
@reta reta force-pushed the issue-3753-docker branch from 6db6654 to 6ffbf25 Compare April 30, 2024 01:43
codefromthecrypt
codefromthecrypt reviewed Apr 30, 2024
View reviewed changes
docker/test-images/zipkin-opensearch2/start-opensearch Outdated
export HEALTHCHECK_PATH=/_cluster/health

# Set tmp folder
OPENSEARCH_TMPDIR=`java -cp 'classes:lib/*' org.opensearch.tools.launchers.TempDirectory`
Copy link
Member

Choose a reason for hiding this comment

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

we are setting this to /tmp as an env variable in dockerfile to /tmp. do you want to always overwrite it like this?

Copy link
Member

Choose a reason for hiding this comment

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

or does TempDirectory consider an existing OPENSEARCH_TMPDIR.. if so, maybe mention in the comment like below on OPENSEARCH_JAVA_OPTS

Copy link
Contributor Author

@reta reta Apr 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Good question, so TempDirectory uses java.io.tmpdir and pre-creates the opensearch folder there

codefromthecrypt
codefromthecrypt approved these changes Apr 30, 2024
View reviewed changes
Copy link
Member

@codefromthecrypt codefromthecrypt left a comment

Choose a reason for hiding this comment

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

looks good!

docker/test-images/zipkin-opensearch2/start-opensearch Outdated
export HEALTHCHECK_PATH=/_cluster/health

# Set tmp folder
OPENSEARCH_TMPDIR=`java -cp 'classes:lib/*' org.opensearch.tools.launchers.TempDirectory`
Copy link
Member

Choose a reason for hiding this comment

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

or does TempDirectory consider an existing OPENSEARCH_TMPDIR.. if so, maybe mention in the comment like below on OPENSEARCH_JAVA_OPTS

docker/test-images/zipkin-opensearch2/start-opensearch Outdated Show resolved Hide resolved
docker/test-images/zipkin-opensearch2/start-opensearch Outdated Show resolved Hide resolved
@reta
Address code review comments
e43991d 
Signed-off-by: Andriy Redko <[email protected]>
@codefromthecrypt codefromthecrypt merged commit 3377f35 into openzipkin:master Apr 30, 2024
14 checks passed
@codefromthecrypt
Copy link
Member

thanks for taking this forward, @reta!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codefromthecrypt codefromthecrypt codefromthecrypt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@reta @codefromthecrypt