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

[tracer] Add support for RID v22a #123

Merged
merged 5 commits into from
Jul 7, 2023
Merged

Conversation

barroco
Copy link
Contributor

@barroco barroco commented Jul 6, 2023

This PR adapts the tracer to support RID v22a. Compatibility with v19 should have been preserved.

Note that it fixes the permissions of /app/health_check.sh file in the docker image to allow the mock_uss start.sh script to overwrite it properly.

Switch of the CI pipeline to build v22a will performed by #119 after merging this PR.

@barroco barroco marked this pull request as ready for review July 7, 2023 08:28
Copy link
Contributor

@mickmis mickmis 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 in general. I have two main comments:

  • (c.f. a comment in the review) the implementation of tracer_rid_isa_notification should be using IMO the code from monitorlib in mutate.rid.ISAChangeNotification
  • is there an easy way to not have separate containers for v19 and v22a, i.e. have all the endpoints for both versions in a single instance? Given that there are also the SCD endpoints in there which don't depend on the RID version I find that slightly confusing. This would also reduce the overall complexity of the deployment.

monitoring/Dockerfile Show resolved Hide resolved
monitoring/monitorlib/rid.py Show resolved Hide resolved
monitoring/mock_uss/run_locally_tracer.sh Outdated Show resolved Hide resolved
monitoring/mock_uss/tracer/resources.py Show resolved Hide resolved
monitoring/mock_uss/tracer/routes/__init__.py Show resolved Hide resolved
monitoring/mock_uss/tracer/routes/rid.py Outdated Show resolved Hide resolved
monitoring/mock_uss/tracer/routes/rid.py Outdated Show resolved Hide resolved
Copy link
Contributor

@mickmis mickmis left a comment

Choose a reason for hiding this comment

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

LGTM after clarifications.
Note: the CI fail because of the addition of --chown, which actually requires buildkit to be used. Using buildkit in the CI would definitely be a good idea, but that's not the scope of this PR, I'd suggest maybe then leaving a TODO in the Dockerfile.

@barroco
Copy link
Contributor Author

barroco commented Jul 7, 2023

  • (c.f. a comment in the review) the implementation of tracer_rid_isa_notification should be using IMO the code from monitorlib in mutate.rid.ISAChangeNotification

As agreed, will be addressed by #124

  • is there an easy way to not have separate containers for v19 and v22a, i.e. have all the endpoints for both versions in a single instance? Given that there are also the SCD endpoints in there which don't depend on the RID version I find that slightly confusing. This would also reduce the overall complexity of the deployment.

I don't see any use case were v19 and v22a should run together. The problem is that the tracer is subscribing to the DSS and it has to know which standard (and endpoint) to use. I privileged to keep the implementation simple knowing that v19 will probably not be used for a long time.

@barroco barroco merged commit 3e86aa2 into interuss:main Jul 7, 2023
@barroco barroco deleted the tracer-v22a branch July 7, 2023 14:48
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.

2 participants