Skip to content

Commit 5e57d09

Browse files
gunturafpmatyjasek-sumo
authored andcommitted
add instrumentation.provider to newrelic default attrs (open-telemetry#2900)
* add instrumentation.provider to newrelic default attrs * use string instead of variables for keys in test
1 parent 555ae2a commit 5e57d09

File tree

3 files changed

+37
-30
lines changed

3 files changed

+37
-30
lines changed

exporter/newrelicexporter/newrelic_test.go

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,10 @@ func TestExportTraceDataMinimum(t *testing.T) {
213213
ID: "0000000000000001",
214214
TraceID: "01010101010101010101010101010101",
215215
Attributes: map[string]interface{}{
216-
"collector.name": name,
217-
"collector.version": version,
218-
"name": "root",
216+
"collector.name": name,
217+
"collector.version": version,
218+
"name": "root",
219+
"instrumentation.provider": "opentelemetry",
219220
},
220221
},
221222
}
@@ -260,35 +261,38 @@ func TestExportTraceDataFullTrace(t *testing.T) {
260261
ID: "0000000000000001",
261262
TraceID: "01010101010101010101010101010101",
262263
Attributes: map[string]interface{}{
263-
"collector.name": name,
264-
"collector.version": version,
265-
"name": "root",
266-
"resource": "R1",
267-
"service.name": "test-service",
264+
"collector.name": name,
265+
"collector.version": version,
266+
"name": "root",
267+
"resource": "R1",
268+
"service.name": "test-service",
269+
"instrumentation.provider": "opentelemetry",
268270
},
269271
},
270272
{
271273
ID: "0000000000000002",
272274
TraceID: "01010101010101010101010101010101",
273275
Attributes: map[string]interface{}{
274-
"collector.name": name,
275-
"collector.version": version,
276-
"name": "client",
277-
"parent.id": "0000000000000001",
278-
"resource": "R1",
279-
"service.name": "test-service",
276+
"collector.name": name,
277+
"collector.version": version,
278+
"name": "client",
279+
"parent.id": "0000000000000001",
280+
"resource": "R1",
281+
"service.name": "test-service",
282+
"instrumentation.provider": "opentelemetry",
280283
},
281284
},
282285
{
283286
ID: "0000000000000003",
284287
TraceID: "01010101010101010101010101010101",
285288
Attributes: map[string]interface{}{
286-
"collector.name": name,
287-
"collector.version": version,
288-
"name": "server",
289-
"parent.id": "0000000000000002",
290-
"resource": "R1",
291-
"service.name": "test-service",
289+
"collector.name": name,
290+
"collector.version": version,
291+
"name": "server",
292+
"parent.id": "0000000000000002",
293+
"resource": "R1",
294+
"service.name": "test-service",
295+
"instrumentation.provider": "opentelemetry",
292296
},
293297
},
294298
}

exporter/newrelicexporter/transformer.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@ import (
3131
)
3232

3333
const (
34-
unitAttrKey = "unit"
35-
descriptionAttrKey = "description"
36-
collectorNameKey = "collector.name"
37-
collectorVersionKey = "collector.version"
38-
instrumentationNameKey = "instrumentation.name"
39-
instrumentationVersionKey = "instrumentation.version"
40-
statusCodeKey = "otel.status_code"
41-
statusDescriptionKey = "otel.status_description"
42-
spanKindKey = "span.kind"
43-
serviceNameKey = "service.name"
34+
unitAttrKey = "unit"
35+
descriptionAttrKey = "description"
36+
collectorNameKey = "collector.name"
37+
collectorVersionKey = "collector.version"
38+
instrumentationNameKey = "instrumentation.name"
39+
instrumentationVersionKey = "instrumentation.version"
40+
instrumentationProviderAttrKey = "instrumentation.provider"
41+
statusCodeKey = "otel.status_code"
42+
statusDescriptionKey = "otel.status_description"
43+
spanKindKey = "span.kind"
44+
serviceNameKey = "service.name"
4445
)
4546

4647
// TODO (MrAlias): unify this with the traceTransformer when the metric data
@@ -148,6 +149,7 @@ func (t *traceTransformer) SpanAttributes(span pdata.Span) map[string]interface{
148149
// (overrides any existing)
149150
attrs[collectorNameKey] = name
150151
attrs[collectorVersionKey] = version
152+
attrs[instrumentationProviderAttrKey] = "opentelemetry"
151153

152154
return attrs
153155
}

exporter/newrelicexporter/transformer_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func defaultAttrFunc(res map[string]interface{}) func(map[string]interface{}) ma
4949
full := make(map[string]interface{}, 2+len(res)+len(add))
5050
full[collectorNameKey] = name
5151
full[collectorVersionKey] = version
52+
full[instrumentationProviderAttrKey] = "opentelemetry"
5253
for k, v := range res {
5354
full[k] = v
5455
}

0 commit comments

Comments
 (0)