diff --git a/exporter/collector/monitoredresource.go b/exporter/collector/monitoredresource.go index 3a795ca81..243e88e18 100644 --- a/exporter/collector/monitoredresource.go +++ b/exporter/collector/monitoredresource.go @@ -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)) } diff --git a/exporter/collector/monitoredresource_test.go b/exporter/collector/monitoredresource_test.go index 0753115f5..46490bdb1 100644 --- a/exporter/collector/monitoredresource_test.go +++ b/exporter/collector/monitoredresource_test.go @@ -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", }, }, { @@ -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", }, }, { @@ -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", }, }, { @@ -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", }, }, { @@ -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", }, }, {