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

Backport of HCP Telemetry Feature into release/1.15.x #17501

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #17460 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@Achooo
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

This is the final PR for the merge of the HCP Telemetry feature branch (feature/hcp-telemetry) into main
A feature branch was used, where the code was thoroughly reviewed in multiple PRs, as seen by the commit history, in order:

  1. [HCP Observability] Move HCP client to subpackage hcp/client #16800
  2. [HCP Observability] New MetricsClient #17100
  3. [HCP Observability] OTELExporter #17128
  4. [HCP Observability] OTELSink #17159
  5. [HCP Observability] Init OTELSink in Telemetry #17162
  6. [HCP Observability] Metrics filtering and Labels in Go Metrics sink #17184
  7. [HCP Observability] Remove replica tag #17484
  8. [HCP Observability] Add custom metrics for OTEL sink, improve logging, upgrade modules and cleanup metrics client #17455
  9. [HCP Observability] Turn off retries for now until dynamically configurable #17496
  10. Last commit for changelog

Feature background

RFC: [CSL-267] Export Server Metrics to HCP

The new HCP Observability feature requires sending Consul Server metrics to HCP's new Telemetry Gateway.
The idea is to create a new OpenTelemetry Go Metrics sink that will be initialized automatically within the fanout sink when a Consul server is registered with the HCP management plane.

minirfc_optionA drawio-10

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/feature/hcp-telemetry/personally-central-caribou branch from cc7c2e9 to d60e96f Compare May 29, 2023 20:11
@hashicorp-cla
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 29, 2023 20:15 Inactive
@vercel vercel bot temporarily deployed to Preview – consul May 29, 2023 20:16 Inactive
@Achooo Achooo marked this pull request as ready for review May 29, 2023 20:45
@Achooo Achooo closed this May 29, 2023
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.

4 participants