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.

Sign up for GitHub

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

Jump to bottom

{taskrun,pipelinerun}metrics: make sure config is up-to-date #8187

Merged
merged 1 commit into from
Aug 8, 2024
Merged

{taskrun,pipelinerun}metrics: make sure config is up-to-date #8187

merged 1 commit into from
Aug 8, 2024

Conversation

vdemeester
Copy link
Member

@vdemeester vdemeester commented Aug 7, 2024 •
edited
Loading

Changes

This updates some metrics package and struct to be able to keep up-to-date the metrics configuration in the background go routines that are used.

Loosly depends on #8184.

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • Has Docs if any changes are user facing, including updates to minimum requirements e.g. Kubernetes version bumps
  • Has Tests included if any functionality added or changed
  • pre-commit Passed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including functionality, content, code)
  • Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
  • Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings). See some examples of good release notes.
  • Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

NONE

@tekton-robot tekton-robot added release-note-none Denotes a PR that doesnt merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 7, 2024
@vdemeester
Copy link
Member Author

/kind misc

@tekton-robot tekton-robot added the kind/misc Categorizes issue or PR as a miscellaneuous one. label Aug 7, 2024
@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/reconciler/pipelinerun/controller.go 81.5% 82.1% 0.7
pkg/reconciler/taskrun/controller.go 85.2% 85.7% 0.5

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage-df to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/reconciler/pipelinerun/controller.go 81.5% 82.1% 0.7
pkg/reconciler/taskrun/controller.go 85.2% 85.7% 0.5

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage-df to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/reconciler/pipelinerun/controller.go 81.5% 82.1% 0.7
pkg/reconciler/taskrun/controller.go 85.2% 85.7% 0.5

@vdemeester
{taskrun,pipelinerun}metrics: make sure config is up-to-date
a4cc7e4 
This updates some metrics package and struct to be able to
keep up-to-date the metrics configuration in the background go
routines that are used.

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/pipelinerunmetrics/metrics.go 84.9% 85.4% 0.5
pkg/reconciler/pipelinerun/controller.go 81.5% 82.1% 0.7
pkg/reconciler/taskrun/controller.go 85.2% 85.7% 0.5
pkg/taskrunmetrics/metrics.go 86.4% 86.6% 0.2

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage-df to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/pipelinerunmetrics/metrics.go 84.9% 85.4% 0.5
pkg/reconciler/pipelinerun/controller.go 81.5% 82.1% 0.7
pkg/reconciler/taskrun/controller.go 85.2% 85.7% 0.5
pkg/taskrunmetrics/metrics.go 86.4% 86.6% 0.2

@gabemontero
Copy link
Contributor

fwiw I was able to verify this change against main branch, along with some temporary logging to prove non-default config.observability changes are picked up, using ko applly -R -f ./config on a local kind cluster

@piyush-garg
Copy link
Contributor

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 8, 2024
@chitrangpatel
Copy link
Member

/approve

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chitrangpatel

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 8, 2024
@tekton-robot tekton-robot merged commit 02dbc17 into tektoncd:main Aug 8, 2024
14 checks passed
@gabemontero
Copy link
Contributor

any chance @vdemeester this could be cherrypicked as far back as 0.61.x ?

@khrm @divyansh42 FYI

@vdemeester
Copy link
Member Author

/cherry-pick release-v0.62.x

@vdemeester
Copy link
Member Author

/cherry-pick release-v0.59.x

@vdemeester
Copy link
Member Author

/cherry-pick release-v0.56.x

@vdemeester
Copy link
Member Author

/cherry-pick release-v0.53.x

@tekton-robot tekton-robot mentioned this pull request Aug 9, 2024
Merged
@tekton-robot
Copy link
Collaborator

@vdemeester: new pull request created: #8198

In response to this:

/cherry-pick release-v0.62.x

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/test-infra repository.

@vdemeester vdemeester deleted the metrics-cfg-update branch August 9, 2024 08:05
@tekton-robot
Copy link
Collaborator

@vdemeester: #8187 failed to apply on top of branch "release-v0.59.x":

Applying: {taskrun,pipelinerun}metrics: make sure config is up-to-date
Using index info to reconstruct a base tree...
M	pkg/pipelinerunmetrics/metrics.go
M	pkg/pipelinerunmetrics/metrics_test.go
M	pkg/reconciler/pipelinerun/controller.go
M	pkg/reconciler/taskrun/controller.go
M	pkg/taskrunmetrics/metrics.go
M	pkg/taskrunmetrics/metrics_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/taskrunmetrics/metrics_test.go
Auto-merging pkg/taskrunmetrics/metrics.go
CONFLICT (content): Merge conflict in pkg/taskrunmetrics/metrics.go
Auto-merging pkg/reconciler/taskrun/controller.go
Auto-merging pkg/reconciler/pipelinerun/controller.go
Auto-merging pkg/pipelinerunmetrics/metrics_test.go
Auto-merging pkg/pipelinerunmetrics/metrics.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 {taskrun,pipelinerun}metrics: make sure config is up-to-date
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.59.x

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/test-infra repository.

@tekton-robot
Copy link
Collaborator

@vdemeester: #8187 failed to apply on top of branch "release-v0.56.x":

Applying: {taskrun,pipelinerun}metrics: make sure config is up-to-date
Using index info to reconstruct a base tree...
M	pkg/pipelinerunmetrics/metrics.go
M	pkg/pipelinerunmetrics/metrics_test.go
M	pkg/reconciler/pipelinerun/controller.go
M	pkg/reconciler/taskrun/controller.go
M	pkg/taskrunmetrics/metrics.go
M	pkg/taskrunmetrics/metrics_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/taskrunmetrics/metrics_test.go
Auto-merging pkg/taskrunmetrics/metrics.go
CONFLICT (content): Merge conflict in pkg/taskrunmetrics/metrics.go
Auto-merging pkg/reconciler/taskrun/controller.go
Auto-merging pkg/reconciler/pipelinerun/controller.go
Auto-merging pkg/pipelinerunmetrics/metrics_test.go
Auto-merging pkg/pipelinerunmetrics/metrics.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 {taskrun,pipelinerun}metrics: make sure config is up-to-date
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.56.x

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/test-infra repository.

@tekton-robot
Copy link
Collaborator

@vdemeester: #8187 failed to apply on top of branch "release-v0.53.x":

Applying: {taskrun,pipelinerun}metrics: make sure config is up-to-date
Using index info to reconstruct a base tree...
M	pkg/pipelinerunmetrics/metrics.go
M	pkg/pipelinerunmetrics/metrics_test.go
M	pkg/reconciler/pipelinerun/controller.go
M	pkg/reconciler/taskrun/controller.go
M	pkg/taskrunmetrics/metrics.go
M	pkg/taskrunmetrics/metrics_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/taskrunmetrics/metrics_test.go
Auto-merging pkg/taskrunmetrics/metrics.go
CONFLICT (content): Merge conflict in pkg/taskrunmetrics/metrics.go
Auto-merging pkg/reconciler/taskrun/controller.go
CONFLICT (content): Merge conflict in pkg/reconciler/taskrun/controller.go
Auto-merging pkg/reconciler/pipelinerun/controller.go
CONFLICT (content): Merge conflict in pkg/reconciler/pipelinerun/controller.go
Auto-merging pkg/pipelinerunmetrics/metrics_test.go
Auto-merging pkg/pipelinerunmetrics/metrics.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 {taskrun,pipelinerun}metrics: make sure config is up-to-date
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.53.x

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/test-infra repository.

@gabemontero gabemontero mentioned this pull request Aug 14, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abayer abayer Awaiting requested review from abayer

@jerop jerop Awaiting requested review from jerop

Assignees

@piyush-garg piyush-garg

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/misc Categorizes issue or PR as a miscellaneuous one. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesnt merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@vdemeester @tekton-robot @gabemontero @piyush-garg @chitrangpatel