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

Odigos UI beta #1744

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Odigos UI beta #1744

wants to merge 20 commits into from

Conversation

alonkeyval
Copy link
Collaborator

No description provided.

alonkeyval and others added 20 commits November 12, 2024 15:27
Co-authored-by: Ben Elferink <ben.elferink@icloud.com>
Co-authored-by: Tamir David <tamir@odigos.io>
Co-authored-by: Tamir David <tamirdavid@Tamirs-MacBook-Pro.local>
Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com>
Co-authored-by: yodigos <yoav@odigos.io>
Co-authored-by: Mike Dame <mike@odigos.io>
Co-authored-by: alonbraymok <alonbraymok007@gmail.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
Co-authored-by: Ben Elferink <ben.elferink@icloud.com>
Co-authored-by: Tamir David <tamir@odigos.io>
Co-authored-by: Tamir David <tamirdavid@Tamirs-MacBook-Pro.local>
Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com>
Co-authored-by: yodigos <yoav@odigos.io>
Co-authored-by: Mike Dame <mike@odigos.io>
Co-authored-by: alonbraymok <alonbraymok007@gmail.com>
Co-authored-by: Ben Elferink <ben.elferink@icloud.com>
Co-authored-by: Tamir David <tamir@odigos.io>
Co-authored-by: Tamir David <tamirdavid@Tamirs-MacBook-Pro.local>
Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com>
Co-authored-by: yodigos <yoav@odigos.io>
Co-authored-by: Mike Dame <mike@odigos.io>
Co-authored-by: alonbraymok <alonbraymok007@gmail.com>
Co-authored-by: Ben Elferink <ben.elferink@icloud.com>
Co-authored-by: Tamir David <tamir@odigos.io>
Co-authored-by: Tamir David <tamirdavid@Tamirs-MacBook-Pro.local>
Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com>
Co-authored-by: yodigos <yoav@odigos.io>
Co-authored-by: Mike Dame <mike@odigos.io>
Co-authored-by: alonbraymok <alonbraymok007@gmail.com>
Co-authored-by: Ben Elferink <ben.elferink@icloud.com>
Co-authored-by: Tamir David <tamir@odigos.io>
Co-authored-by: Tamir David <tamirdavid@Tamirs-MacBook-Pro.local>
Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com>
Co-authored-by: yodigos <yoav@odigos.io>
Co-authored-by: Mike Dame <mike@odigos.io>
Co-authored-by: alonbraymok <alonbraymok007@gmail.com>
Co-authored-by: Ben Elferink <ben.elferink@icloud.com>
Co-authored-by: Tamir David <tamir@odigos.io>
Co-authored-by: Tamir David <tamirdavid@Tamirs-MacBook-Pro.local>
Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com>
Co-authored-by: yodigos <yoav@odigos.io>
Co-authored-by: Mike Dame <mike@odigos.io>
Co-authored-by: alonbraymok <alonbraymok007@gmail.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
This pull request introduces several changes to the `cli/cmd/ui.go` and
`frontend` directories, focusing on adding support for a beta UI,
enhancing instrumentation labeling, and refactoring the code to use the
Gin framework for HTTP handling.

### Support for Beta UI:
* Added a new constant `betaDefaultPort` and modified the `uiCmd` to
include a `beta` flag that allows port-forwarding the beta UI pod on
port 3001. (`cli/cmd/ui.go`)
[[1]](diffhunk://#diff-bdc4ded2bf4628241563326d5d7b0443b57d2d37b674014da632b14b78a1c309R29)
[[2]](diffhunk://#diff-bdc4ded2bf4628241563326d5d7b0443b57d2d37b674014da632b14b78a1c309R55-L61)
[[3]](diffhunk://#diff-bdc4ded2bf4628241563326d5d7b0443b57d2d37b674014da632b14b78a1c309L156-R166)
* Updated the `frontend/main.go` to support running a separate server
for the beta UI, including embedding the beta UI files and handling
GraphQL requests. (`frontend/main.go`)
[[1]](diffhunk://#diff-3157268136b8d5514c0baed4c63042c62e3a16048a0346448241152dcd66b209R45-R52)
[[2]](diffhunk://#diff-3157268136b8d5514c0baed4c63042c62e3a16048a0346448241152dcd66b209R61-R71)
[[3]](diffhunk://#diff-3157268136b8d5514c0baed4c63042c62e3a16048a0346448241152dcd66b209R111-R160)
[[4]](diffhunk://#diff-3157268136b8d5514c0baed4c63042c62e3a16048a0346448241152dcd66b209L207-R263)
[[5]](diffhunk://#diff-3157268136b8d5514c0baed4c63042c62e3a16048a0346448241152dcd66b209R274-R275)
[[6]](diffhunk://#diff-3157268136b8d5514c0baed4c63042c62e3a16048a0346448241152dcd66b209R321-R325)
[[7]](diffhunk://#diff-3157268136b8d5514c0baed4c63042c62e3a16048a0346448241152dcd66b209R343-R358)

### Instrumentation Labeling Enhancements:
* Renamed `WorkloadLabeled` to `AppInstrumentationLabeled` and
introduced new fields `NsInstrumentationLabeled` and
`InstrumentationEffective` to track instrumentation status more
accurately. (`frontend/endpoints/applications.go`)
[[1]](diffhunk://#diff-56e335a7772d748ae7b495448e4a634d84785cf2a7fb05f3d8dec47e2b44478bL37-R39)
[[2]](diffhunk://#diff-56e335a7772d748ae7b495448e4a634d84785cf2a7fb05f3d8dec47e2b44478bR116-R128)
[[3]](diffhunk://#diff-56e335a7772d748ae7b495448e4a634d84785cf2a7fb05f3d8dec47e2b44478bL128-R143)
[[4]](diffhunk://#diff-56e335a7772d748ae7b495448e4a634d84785cf2a7fb05f3d8dec47e2b44478bL153-R168)
[[5]](diffhunk://#diff-56e335a7772d748ae7b495448e4a634d84785cf2a7fb05f3d8dec47e2b44478bL178-R193)
* Modified the logic to determine if the entire namespace is
instrumented and updated the response accordingly.
(`frontend/endpoints/applications.go`)

### Refactoring to Use Gin Framework:
* Updated several endpoints to use the Gin framework for handling HTTP
requests, improving the structure and maintainability of the code.
(`frontend/endpoints/config.go`, `frontend/endpoints/destinations.go`,
`frontend/endpoints/namespaces.go`, `frontend/endpoints/sources.go`)
[[1]](diffhunk://#diff-b04460d41d47aa6ee24a85a55e467cdf997da42e7f6da57e190b8e8b2d08840dR7-R9)
[[2]](diffhunk://#diff-b04460d41d47aa6ee24a85a55e467cdf997da42e7f6da57e190b8e8b2d08840dL25-R37)
[[3]](diffhunk://#diff-c1671317c3a61839657a19f4a5f3a466d214f54a2a249a252dfa006a7050cac8L7-R9)
[[4]](diffhunk://#diff-1878fe0d154a7e1bf75befd5acc7e63fddcff0648bff1ec9222a1e33ef0c8baaL77-L116)
[[5]](diffhunk://#diff-eb60fd5fafb8fc63f42d4cbf9a4ca5f1e06481ab2d068f942631667f3ac22688L89-R95)

### Dockerfile Update:
* Added a new copy command to include additional dependencies in the
Docker build process. (`frontend/Dockerfile`)

These changes collectively improve the functionality and maintainability
of the code, providing better support for a beta UI and enhancing the
instrumentation labeling mechanism.

---------

Co-authored-by: Ben Elferink <ben.elferink@icloud.com>
Co-authored-by: Tamir David <tamir@odigos.io>
Co-authored-by: Tamir David <tamirdavid@Tamirs-MacBook-Pro.local>
Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com>
Co-authored-by: yodigos <yoav@odigos.io>
Co-authored-by: Mike Dame <mike@odigos.io>
Co-authored-by: alonbraymok <alonbraymok007@gmail.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
Co-authored-by: Ben Elferink <ben.elferink@icloud.com>
Co-authored-by: Tamir David <tamir@odigos.io>
Co-authored-by: Tamir David <tamirdavid@Tamirs-MacBook-Pro.local>
Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
Co-authored-by: Ron Federman <73110295+RonFed@users.noreply.github.com>
Co-authored-by: yodigos <yoav@odigos.io>
Co-authored-by: Mike Dame <mike@odigos.io>
Co-authored-by: alonbraymok <alonbraymok007@gmail.com>
Co-authored-by: Alon Braymok <138359965+alonkeyval@users.noreply.github.com>
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