diff --git a/CHANGELOG.md b/CHANGELOG.md index c4f3298a63c..5cd8a247ca1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm The route is already added automatically for spans. For metrics, the alternative is to use the `WithMetricAttributesFn` option. (#8268) +### Changed + +- `go.opentelemetry.io/contrib/detectors/azure/azurevm` now uses semantic convention key constants with `.String()` method instead of helper functions for creating resource attributes. (#8346) + diff --git a/detectors/azure/azurevm/vm.go b/detectors/azure/azurevm/vm.go index 288d4d81071..f81eb6bdd55 100644 --- a/detectors/azure/azurevm/vm.go +++ b/detectors/azure/azurevm/vm.go @@ -60,25 +60,25 @@ func (detector *ResourceDetector) Detect(ctx context.Context) (*resource.Resourc } if metadata.VMId != nil { - attributes = append(attributes, semconv.HostID(*metadata.VMId)) + attributes = append(attributes, semconv.HostIDKey.String(*metadata.VMId)) } if metadata.Location != nil { - attributes = append(attributes, semconv.CloudRegion(*metadata.Location)) + attributes = append(attributes, semconv.CloudRegionKey.String(*metadata.Location)) } if metadata.ResourceId != nil { - attributes = append(attributes, semconv.CloudResourceID(*metadata.ResourceId)) + attributes = append(attributes, semconv.CloudResourceIDKey.String(*metadata.ResourceId)) } if metadata.Name != nil { - attributes = append(attributes, semconv.HostName(*metadata.Name)) + attributes = append(attributes, semconv.HostNameKey.String(*metadata.Name)) } if metadata.VMSize != nil { - attributes = append(attributes, semconv.HostType(*metadata.VMSize)) + attributes = append(attributes, semconv.HostTypeKey.String(*metadata.VMSize)) } if metadata.OsType != nil { attributes = append(attributes, semconv.OSTypeKey.String(*metadata.OsType)) } if metadata.Version != nil { - attributes = append(attributes, semconv.OSVersion(*metadata.Version)) + attributes = append(attributes, semconv.OSVersionKey.String(*metadata.Version)) } return resource.NewWithAttributes(semconv.SchemaURL, attributes...), nil diff --git a/detectors/azure/azurevm/vm_test.go b/detectors/azure/azurevm/vm_test.go index d1fc92436ca..4f18776af3f 100644 --- a/detectors/azure/azurevm/vm_test.go +++ b/detectors/azure/azurevm/vm_test.go @@ -47,13 +47,13 @@ func TestDetect(t *testing.T) { resource: resource.NewWithAttributes(semconv.SchemaURL, []attribute.KeyValue{ semconv.CloudProviderAzure, semconv.CloudPlatformAzureVM, - semconv.CloudRegion("us-west3"), - semconv.CloudResourceID("/subscriptions/sid/resourceGroups/rid/providers/pname/name"), - semconv.HostID("43f65c49-8715-4639-88a9-be6d7eb749a5"), - semconv.HostName("localhost-3"), - semconv.HostType("Standard_D2s_v3"), + semconv.CloudRegionKey.String("us-west3"), + semconv.CloudResourceIDKey.String("/subscriptions/sid/resourceGroups/rid/providers/pname/name"), + semconv.HostIDKey.String("43f65c49-8715-4639-88a9-be6d7eb749a5"), + semconv.HostNameKey.String("localhost-3"), + semconv.HostTypeKey.String("Standard_D2s_v3"), semconv.OSTypeKey.String("linux"), - semconv.OSVersion("6.5.0-26-generic"), + semconv.OSVersionKey.String("6.5.0-26-generic"), }...), err: false, },