Skip to content

Commit

Permalink
Merge branch 'main' into odiglet-to-use-criwrapper-to-create-ic
Browse files Browse the repository at this point in the history
  • Loading branch information
tamirdavid1 authored Dec 16, 2024
2 parents eb356f4 + 1433f99 commit 298dd4b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions cli/cmd/ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ var uiCmd = &cobra.Command{
if legacyFlag {
clusterPort = legacyDefaultPort
}
fmt.Printf("Is legacy: %v\n", legacyFlag)
fmt.Printf("Cluster port: %d\n", clusterPort)

localAddress := cmd.Flag("address").Value.String()
uiPod, err := findOdigosUIPod(client, ctx, ns)
if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ const renderValue = (type: DataCardRow['type'], value: DataCardRow['value']) =>
type={NOTIFICATION_TYPE.INFO}
message={
hasPresenceOfOtherAgent
? `By default, we do not operate alongside the ${otherAgent} Agent. Please contact the Odigos team for guidance on enabling this configuration.`
? `By default, we do not operate alongside the ${otherAgent}. Please contact the Odigos team for guidance on enabling this configuration.`
: canRunInParallel
? `We are operating alongside the ${otherAgent} Agent, which is not the recommended configuration. We suggest disabling the ${otherAgent} Agent for optimal performance.`
? `We are operating alongside the ${otherAgent}, which is not the recommended configuration. We suggest disabling the ${otherAgent} for optimal performance.`
: `Concurrent execution with the ${otherAgent} is not supported. Please disable one of the agents to enable proper instrumentation.`
}
/>
Expand Down

0 comments on commit 298dd4b

Please sign in to comment.