-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
feat(opentelemetry): ✨ support for secured OTLP endpoint and headers #15573
feat(opentelemetry): ✨ support for secured OTLP endpoint and headers #15573
Conversation
Signed-off-by: Prashant Shahi <[email protected]>
Signed-off-by: Prashant Shahi <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #15573 +/- ##
==========================================
+ Coverage 49.53% 49.55% +0.02%
==========================================
Files 269 269
Lines 47222 47243 +21
==========================================
+ Hits 23392 23413 +21
Misses 21530 21530
Partials 2300 2300 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Prashant Shahi <[email protected]>
Signed-off-by: Prashant Shahi <[email protected]>
Signed-off-by: Prashant Shahi <[email protected]>
Signed-off-by: Prashant Shahi <[email protected]>
Signed-off-by: Prashant Shahi <[email protected]>
docs/operator-manual/server-commands/argocd-application-controller.md
Outdated
Show resolved
Hide resolved
Signed-off-by: Prashant Shahi <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🎉
@blakepettersson Thanks for the review. |
@@ -206,6 +208,8 @@ func NewCommand() *cobra.Command { | |||
command.Flags().BoolVar(&repoServerStrictTLS, "repo-server-strict-tls", env.ParseBoolFromEnv("ARGOCD_APPLICATION_CONTROLLER_REPO_SERVER_STRICT_TLS", false), "Whether to use strict validation of the TLS cert presented by the repo server") | |||
command.Flags().StringSliceVar(&metricsAplicationLabels, "metrics-application-labels", []string{}, "List of Application labels that will be added to the argocd_application_labels metric") | |||
command.Flags().StringVar(&otlpAddress, "otlp-address", env.StringFromEnv("ARGOCD_APPLICATION_CONTROLLER_OTLP_ADDRESS", ""), "OpenTelemetry collector address to send traces to") | |||
command.Flags().BoolVar(&otlpInsecure, "otlp-insecure", env.ParseBoolFromEnv("ARGOCD_APPLICATION_CONTROLLER_OTLP_INSECURE", true), "OpenTelemetry collector insecure mode") | |||
command.Flags().StringToStringVar(&otlpHeaders, "otlp-headers", env.ParseStringToStringFromEnv("ARGOCD_SERVER_OTLP_HEADERS", map[string]string{}, ","), "List of OpenTelemetry collector extra headers sent with traces, headers are comma-separated key-value pairs(e.g. key1=value1,key2=value2)") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gdsoumya updated
Signed-off-by: Prashant Shahi <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Thanks for the contribution.
@prashant-shahi codegen ci step is failing can you run |
Signed-off-by: Prashant Shahi <[email protected]>
@gdsoumya Thanks a lot for the review! 🎉 |
…rgoproj#15573) * feat(opentelemetry): ✨ support for secured OTLP endpoint and headers Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 include new otlp headers in docs Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 update readme docs as per integration tests Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 update readme docs as per integration tests Signed-off-by: Prashant Shahi <[email protected]> * chore: resolve indentation issues Signed-off-by: Prashant Shahi <[email protected]> * chore: fix indentation issues Signed-off-by: Prashant Shahi <[email protected]> * chore: include OTLP options in deployment manifests Signed-off-by: Prashant Shahi <[email protected]> * fix: update manifests to resolve failing CI Signed-off-by: Prashant Shahi <[email protected]> --------- Signed-off-by: Prashant Shahi <[email protected]>
…rgoproj#15573) * feat(opentelemetry): ✨ support for secured OTLP endpoint and headers Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 include new otlp headers in docs Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 update readme docs as per integration tests Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 update readme docs as per integration tests Signed-off-by: Prashant Shahi <[email protected]> * chore: resolve indentation issues Signed-off-by: Prashant Shahi <[email protected]> * chore: fix indentation issues Signed-off-by: Prashant Shahi <[email protected]> * chore: include OTLP options in deployment manifests Signed-off-by: Prashant Shahi <[email protected]> * fix: update manifests to resolve failing CI Signed-off-by: Prashant Shahi <[email protected]> --------- Signed-off-by: Prashant Shahi <[email protected]>
…rgoproj#15573) * feat(opentelemetry): ✨ support for secured OTLP endpoint and headers Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 include new otlp headers in docs Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 update readme docs as per integration tests Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 update readme docs as per integration tests Signed-off-by: Prashant Shahi <[email protected]> * chore: resolve indentation issues Signed-off-by: Prashant Shahi <[email protected]> * chore: fix indentation issues Signed-off-by: Prashant Shahi <[email protected]> * chore: include OTLP options in deployment manifests Signed-off-by: Prashant Shahi <[email protected]> * fix: update manifests to resolve failing CI Signed-off-by: Prashant Shahi <[email protected]> --------- Signed-off-by: Prashant Shahi <[email protected]> Signed-off-by: Kevin Lyda <[email protected]>
…rgoproj#15573) * feat(opentelemetry): ✨ support for secured OTLP endpoint and headers Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 include new otlp headers in docs Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 update readme docs as per integration tests Signed-off-by: Prashant Shahi <[email protected]> * docs(opentelemetry): 📝 update readme docs as per integration tests Signed-off-by: Prashant Shahi <[email protected]> * chore: resolve indentation issues Signed-off-by: Prashant Shahi <[email protected]> * chore: fix indentation issues Signed-off-by: Prashant Shahi <[email protected]> * chore: include OTLP options in deployment manifests Signed-off-by: Prashant Shahi <[email protected]> * fix: update manifests to resolve failing CI Signed-off-by: Prashant Shahi <[email protected]> --------- Signed-off-by: Prashant Shahi <[email protected]>
This PR adds support for sending Argo CD traces to secured OTLP endpoint along with the custom headers.
These can be configured with the help of these flags:
--otlp-header
and--otlp-insecure
.Fixes #12310 (proposal by @mtsvyatkovski)
Fixes #13927 (proposal by @bencompton)
Checklist:
Signed-off-by: Prashant Shahi [email protected]