Skip to content

fix: update distributed_tracing.go to include a service proxy #502

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

Merged
merged 1 commit into from
Jun 10, 2024

Conversation

zhuje
Copy link
Contributor

@zhuje zhuje commented Jun 6, 2024

Updates are needed to reflect the changes in PR: openshift/distributed-tracing-console-plugin#15, which allows the distributed-tracing-console-plugin to use this proxy service at the endpoint : /api/proxy/plugin/distributed-tracing-console-plugin/backend

@zhuje zhuje requested a review from a team as a code owner June 6, 2024 19:17
@zhuje zhuje requested review from danielmellado and simonpasquier and removed request for a team June 6, 2024 19:17
@openshift-ci openshift-ci bot requested a review from sthaha June 6, 2024 19:17
Copy link

openshift-ci bot commented Jun 6, 2024

Hi @zhuje. Thanks for your PR.

I'm waiting for a rhobs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@zhuje zhuje changed the title [WIP] Update distributed_tracing.go to include a Service Proxy [WIP] fix: update distributed_tracing.go to include a service proxy Jun 6, 2024
Comment on lines 35 to 42
if plugin.Spec.TroubleshootingPanel != nil {
if plugin.Spec.TroubleshootingPanel.Korrel8r.Name != "" {
proxyName = plugin.Spec.TroubleshootingPanel.Korrel8r.Name
}
if plugin.Spec.TroubleshootingPanel.Korrel8r.Namespace != "" {
proxyNamespace = plugin.Spec.TroubleshootingPanel.Korrel8r.Namespace
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

The code here is for korrel8r and the troubleshooting panel. But I think the intention here is to define this fields in the DistributedTracingConfig spec so they can be configured if not using the defaults

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I removed this in the latest commit.

@@ -29,13 +30,36 @@ func createDistributedTracingPluginInfo(plugin *uiv1alpha1.UIPlugin, namespace,
extraArgs = append(extraArgs, fmt.Sprintf("-features=%s", strings.Join(features, ",")))
}

proxyName, proxyNamespace := "distributed-tracing-console-plugin", "openshift-tracing"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
proxyName, proxyNamespace := "distributed-tracing-console-plugin", "openshift-tracing"
defaultServiceName, defaultServiceNamespace := "distributed-tracing-console-plugin", "openshift-tracing"

Copy link
Contributor

Choose a reason for hiding this comment

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

Name and namespace are passed in as parameters to the createDistributedTracingPluginInfo function and we should use them so that the service and the proxy don't get out of sync.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I updated this in the latest commit.

@zhuje zhuje force-pushed the coo_tracing_update branch from d05dcf9 to ac7515e Compare June 7, 2024 15:32
@zhuje zhuje changed the title [WIP] fix: update distributed_tracing.go to include a service proxy fix: update distributed_tracing.go to include a service proxy Jun 7, 2024
@openshift-ci openshift-ci bot added the lgtm label Jun 10, 2024
@jgbernalp
Copy link
Contributor

/lgtm

@jgbernalp
Copy link
Contributor

/ok-to-test

@simonpasquier
Copy link
Contributor

/approve

Copy link

openshift-ci bot commented Jun 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jgbernalp, simonpasquier, zhuje

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit d359118 into rhobs:main Jun 10, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants