Skip to content

[exporter/collector] Promote service.version #1065

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.

Sign up for GitHub

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

Open
braydonk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[exporter/collector] Promote service.version #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion exporter/collector/monitoredresource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ func filterAttributes(
if serviceResourceLabels &&
(k == semconv.AttributeServiceName ||
k == semconv.AttributeServiceNamespace ||
k == semconv.AttributeServiceInstanceID) {
k == semconv.AttributeServiceInstanceID ||
k == semconv.AttributeServiceVersion) {
if len(v.AsString()) > 0 {
v.CopyTo(attrs.PutEmpty(k))
}
Expand Down
10 changes: 10 additions & 0 deletions exporter/collector/monitoredresource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,11 +659,13 @@ func TestResourceToMetricLabels(t *testing.T) {
"service.namespace": "myservicenamespace",
"service.name": "myservicename",
"service.instance.id": "myserviceinstanceid",
"service.version": "myserviceversion",
},
expectExtraLabels: labels{
"service_namespace": "myservicenamespace",
"service_name": "myservicename",
"service_instance_id": "myserviceinstanceid",
"service_version": "myserviceversion",
},
},
{
Expand Down Expand Up @@ -704,11 +706,13 @@ func TestResourceToMetricLabels(t *testing.T) {
"service.namespace": "myservicenamespace",
"service.name": "myservicename",
"service.instance.id": "myserviceinstanceid",
"service.version": "myserviceversion",
},
expectExtraLabels: labels{
"service_namespace": "myservicenamespace",
"service_name": "myservicename",
"service_instance_id": "myserviceinstanceid",
"service_version": "myserviceversion",
},
},
{
Expand All @@ -717,11 +721,13 @@ func TestResourceToMetricLabels(t *testing.T) {
"service.namespace": "myservicenamespace",
"service.name": "myservicename",
"service.instance.id": "myserviceinstanceid",
"service.version": "myserviceversion",
},
expectExtraLabels: labels{
"service_namespace": "myservicenamespace",
"service_name": "myservicename",
"service_instance_id": "myserviceinstanceid",
"service_version": "myserviceversion",
},
},
{
Expand All @@ -732,11 +738,13 @@ func TestResourceToMetricLabels(t *testing.T) {
"service.namespace": "myservicenamespace",
"service.name": "myservicename",
"service.instance.id": "myserviceinstanceid",
"service.version": "myserviceversion",
},
expectExtraLabels: labels{
"service_namespace": "myservicenamespace",
"service_name": "myservicename",
"service_instance_id": "myserviceinstanceid",
"service_version": "myserviceversion",
},
},
{
Expand All @@ -747,11 +755,13 @@ func TestResourceToMetricLabels(t *testing.T) {
"service.namespace": "myservicenamespace",
"service.name": "myservicename",
"service.instance.id": "myserviceinstanceid",
"service.version": "myserviceversion",
},
expectExtraLabels: labels{
"service_namespace": "myservicenamespace",
"service_name": "myservicename",
"service_instance_id": "myserviceinstanceid",
"service_version": "myserviceversion",
},
},
{
Expand Down
Loading