-
Notifications
You must be signed in to change notification settings - Fork 359
Replace dogstatsd metrics with opentelemetry metrics (take 2) #4025
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
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -188,10 +188,8 @@ type AgentStartConfig struct { | |
|
|
||
| HealthCheckAddr string `cli:"health-check-addr"` | ||
|
|
||
| // Datadog statsd metrics config | ||
| MetricsDatadog bool `cli:"metrics-datadog"` | ||
| MetricsDatadogHost string `cli:"metrics-datadog-host"` | ||
| MetricsDatadogDistributions bool `cli:"metrics-datadog-distributions"` | ||
| // Metrics config | ||
| OpenTelemetryMetrics bool `cli:"opentelemetry-metrics"` | ||
|
|
||
| // Tracing config | ||
| TracingBackend string `cli:"tracing-backend"` | ||
|
|
@@ -289,8 +287,8 @@ func (asc AgentStartConfig) Features(ctx context.Context) []string { | |
| features = append(features, "env-godebug") | ||
| } | ||
|
|
||
| if asc.MetricsDatadog { | ||
| features = append(features, "datadog-metrics") | ||
| if asc.OpenTelemetryMetrics { | ||
| features = append(features, "opentelemetry-metrics") | ||
| } | ||
|
|
||
| return features | ||
|
|
@@ -622,20 +620,9 @@ var AgentStartCommand = &cli.Command{ | |
| Sources: cli.EnvVars("BUILDKITE_ALLOWED_PLUGINS"), | ||
| }, | ||
| &cli.BoolFlag{ | ||
| Name: "metrics-datadog", | ||
| Usage: "Send metrics to DogStatsD for Datadog (default: false)", | ||
| Sources: cli.EnvVars("BUILDKITE_METRICS_DATADOG"), | ||
| }, | ||
| &cli.StringFlag{ | ||
| Name: "metrics-datadog-host", | ||
| Usage: "The dogstatsd instance to send metrics to using udp", | ||
| Sources: cli.EnvVars("BUILDKITE_METRICS_DATADOG_HOST"), | ||
| Value: "127.0.0.1:8125", | ||
| }, | ||
| &cli.BoolFlag{ | ||
| Name: "metrics-datadog-distributions", | ||
| Usage: "Use Datadog Distributions for Timing metrics (default: false)", | ||
| Sources: cli.EnvVars("BUILDKITE_METRICS_DATADOG_DISTRIBUTIONS"), | ||
| Name: "opentelemetry-metrics", | ||
| Usage: "Enable agent metrics export over OpenTelemetry OTLP. Configure OTLP with standard OTEL_EXPORTER_OTLP_* env vars (default: false)", | ||
| Sources: cli.EnvVars("BUILDKITE_OPENTELEMETRY_METRICS"), | ||
| }, | ||
| &cli.StringFlag{ | ||
| Name: "log-format", | ||
|
|
@@ -676,7 +663,7 @@ var AgentStartCommand = &cli.Command{ | |
| }, | ||
| &cli.StringFlag{ | ||
| Name: "tracing-service-name", | ||
| Usage: "Service name to use when reporting traces.", | ||
| Usage: "Service name to use when reporting telemetry.", | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should the flag also change to
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done, including the env var |
||
| Sources: cli.EnvVars("BUILDKITE_TRACING_SERVICE_NAME"), | ||
| Value: "buildkite-agent", | ||
| }, | ||
|
|
@@ -892,9 +879,8 @@ var AgentStartCommand = &cli.Command{ | |
| } | ||
|
|
||
| mc := metrics.NewCollector(l, metrics.CollectorConfig{ | ||
| Datadog: cfg.MetricsDatadog, | ||
| DatadogHost: cfg.MetricsDatadogHost, | ||
| DatadogDistributions: cfg.MetricsDatadogDistributions, | ||
| Enabled: cfg.OpenTelemetryMetrics, | ||
| ServiceName: cfg.TracingServiceName, | ||
| }) | ||
|
|
||
| // Sense check supported tracing backends, we don't want bootstrapped jobs to silently have no tracing | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Did we still want a
success/failedmetric here?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.
#3874 specifically included in the changes: