Skip to content

Commit 32e21aa

Browse files
Alex Greenbanksbylica-splunk
authored andcommitted
[receiver/datadog] Fix service_check name conversion (open-telemetry#35718)
#### Description Use the `Check` name supplied in the Service Check structure rather than hard-coding the resulting metric as `service_check`. Unit tests and e2e test updated accordingly. --------- Signed-off-by: alexgreenbank <[email protected]>
1 parent 259677e commit 32e21aa

File tree

4 files changed

+31
-3
lines changed

4 files changed

+31
-3
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: datadogreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Use `Check` name from Service Check structure as metric name rather than hardcoded string `service_check`"
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [35718]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

receiver/datadogreceiver/internal/translator/service_check_translator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (mt *MetricsTranslator) TranslateServices(services []ServiceCheck) pmetric.
2727
bt.Metrics = pmetric.NewMetrics()
2828

2929
for _, service := range services {
30-
metricProperties := parseSeriesProperties("service_check", "service_check", service.Tags, service.HostName, mt.buildInfo.Version, mt.stringPool)
30+
metricProperties := parseSeriesProperties(service.Check, "service_check", service.Tags, service.HostName, mt.buildInfo.Version, mt.stringPool)
3131
metric, metricID := bt.Lookup(metricProperties) // TODO(alexg): proper name
3232

3333
dps := metric.Gauge().DataPoints()

receiver/datadogreceiver/internal/translator/service_check_translator_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func TestTranslateCheckRun(t *testing.T) {
187187
requireScope(t, result, expectedAttrs.scope, component.NewDefaultBuildInfo().Version)
188188

189189
metric := result.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0)
190-
requireGauge(t, metric, "service_check", 1)
190+
requireGauge(t, metric, "app.working", 1)
191191

192192
dp := metric.Gauge().DataPoints().At(0)
193193
requireDp(t, dp, expectedAttrs.dp, 1700000000, 0)
@@ -213,7 +213,7 @@ func TestTranslateCheckRun(t *testing.T) {
213213
requireScope(t, result, expectedAttrs.scope, component.NewDefaultBuildInfo().Version)
214214

215215
metric := result.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0)
216-
requireGauge(t, metric, "service_check", 1)
216+
requireGauge(t, metric, "app.working", 1)
217217

218218
dp := metric.Gauge().DataPoints().At(0)
219219
requireDp(t, dp, expectedAttrs.dp, 0, 0)

receiver/datadogreceiver/receiver_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,7 @@ func TestDatadogServices_EndToEnd(t *testing.T) {
619619
metrics := got.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics()
620620
assert.Equal(t, 1, metrics.Len())
621621
metric := metrics.At(0)
622+
assert.Equal(t, "app.working", metric.Name())
622623
assert.Equal(t, pmetric.MetricTypeGauge, metric.Type())
623624
dps := metric.Gauge().DataPoints()
624625
assert.Equal(t, 1, dps.Len())

0 commit comments

Comments
 (0)