Skip to content

Commit

Permalink
Merge branch 'main' into cloud-build-file
Browse files Browse the repository at this point in the history
  • Loading branch information
damemi authored Feb 10, 2025
2 parents b7385f2 + 8dbd659 commit 02771c8
Show file tree
Hide file tree
Showing 207 changed files with 2,109 additions and 10,946 deletions.
59 changes: 22 additions & 37 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Contributing Guide

* [Welcome](#welcome)
* [Ways to Contribute](#ways-to-contribute)
* [Find an Issue](#find-an-issue)
* [Issue Guidelines](#issue-guidelines)
* [Pull Request Guidelines](#pull-request-guidelines)
* [Communication](#communication)
* [Code Review Process](#code-review-process)
* [Testing Requirements](#testing-requirements)
* [Code of Conduct](#code-of-conduct)
* [License](#license)
* [Local Development](#local-development)
- [Welcome](#welcome)
- [Ways to Contribute](#ways-to-contribute)
- [Find an Issue](#find-an-issue)
- [Issue Guidelines](#issue-guidelines)
- [Pull Request Guidelines](#pull-request-guidelines)
- [Communication](#communication)
- [Code Review Process](#code-review-process)
- [Testing Requirements](#testing-requirements)
- [Code of Conduct](#code-of-conduct)
- [License](#license)
- [Local Development](#local-development)
- [Run Odigos CLI from Code](#run-odigos-cli-from-code)
- [How to Develop Odigos Locally](#how-to-develop-odigos-locally)
- [How to Build and Run Odigos Frontend Locally](#how-to-build-and-run-odigos-frontend-locally)
* [Odiglet](#odiglet)
- [Odiglet](#odiglet)
- [Builder Base Image](#builder-base-image)
- [Remote Debugging](#remote-debugging)
* [Instrumentor](#instrumentor)
- [Instrumentor](#instrumentor)
- [Debugging](#debugging)

Welcome! We are glad that you want to contribute to our project! 💖
Expand Down Expand Up @@ -120,11 +120,11 @@ First, follow the [Quickstart Guide](https://docs.odigos.io/quickstart/introduct

Make sure you are able to:

- [X] run Odigos CLI in your terminal.
- [X] open the demo application UI in your browser to interact with it.
- [X] install odigos in your development cluster with `odigos install`.
- [X] open Odigos UI in your browser to interact with it.
- [X] see telemetry data that odigos generates, for example traces in jaeger.
- [x] run Odigos CLI in your terminal.
- [x] open the demo application UI in your browser to interact with it.
- [x] install odigos in your development cluster with `odigos install`.
- [x] open Odigos UI in your browser to interact with it.
- [x] see telemetry data that odigos generates, for example traces in jaeger.

After you have a working odigos setup, you can start making changes to the code and test them locally.

Expand Down Expand Up @@ -162,9 +162,9 @@ make deploy
- Deploy a specific service by running one of the following commands:

```bash
make deploy-odiglet
make deploy-autoscaler
make deploy-collector
make deploy-odiglet
make deploy-autoscaler
make deploy-collector
make deploy-scheduler
make deploy-instrumentor
make deploy-ui
Expand All @@ -184,22 +184,7 @@ See the [Odigos docs](https://docs.odigos.io/intro) for the full steps on debugg

### How to Build and run Odigos Frontend Locally

Build the frontend

```bash
cd frontend/webapp
yarn install
yarn build
yarn dev
cd ../.. # back to root of the project for next steps
```

Then run the web server

```bash
cd frontend
go build -o odigos-backend && ./odigos-backend --port 8085 --debug --address 0.0.0.0
```
See the [Frontend README.md](https://github.com/odigos-io/odigos/blob/main/frontend/webapp/README.md) for the full steps.

## Odiglet

Expand Down
26 changes: 0 additions & 26 deletions frontend/graph/conversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"time"

"github.com/odigos-io/odigos/api/odigos/v1alpha1"
"github.com/odigos-io/odigos/destinations"
"github.com/odigos-io/odigos/frontend/graph/model"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -21,19 +20,6 @@ func k8sKindToGql(k8sResourceKind string) model.K8sResourceKind {
return ""
}

func k8sConditionStatusToGql(status v1.ConditionStatus) model.ConditionStatus {
switch status {
case v1.ConditionTrue:
return model.ConditionStatusTrue
case v1.ConditionFalse:
return model.ConditionStatusFalse
case v1.ConditionUnknown:
return model.ConditionStatusUnknown
}
return model.ConditionStatusUnknown

}

// Convert LastTransitionTime to a string pointer if it's not nil
func k8sLastTransitionTimeToGql(t v1.Time) *string {
if t.IsZero() {
Expand Down Expand Up @@ -85,18 +71,6 @@ func instrumentationConfigToActualSource(instruConfig v1alpha1.InstrumentationCo
}
}

func convertCustomReadDataLabels(labels []*destinations.CustomReadDataLabel) []*model.CustomReadDataLabel {
var result []*model.CustomReadDataLabel
for _, label := range labels {
result = append(result, &model.CustomReadDataLabel{
Condition: label.Condition,
Title: label.Title,
Value: label.Value,
})
}
return result
}

func convertConditions(conditions []v1.Condition) []*model.Condition {
var result []*model.Condition
for _, c := range conditions {
Expand Down
Loading

0 comments on commit 02771c8

Please sign in to comment.