feat(attributes) bump semconv to 1.26.0

CHANGELOG.md

@@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Changed
 
 - The function signature of `NewLogProcessor` in `go.opentelemetry.io/contrib/processors/minsev` has changed to accept the added `Severitier` interface instead of a `log.Severity`. (#6116)
+- Attributes for otelmongo will change to reflect [semconv/v1.26.0](https://github.com/open-telemetry/opentelemetry-go/pull/5476). `db.operation` will change to `db.operation.name`, `db.name` will change to `db.namespace`, `net.peer.port` will change to `network.peer.port`, `net.transport` will change to `network.transport`, and `db.statement` will change to `db.query.text`. 
 
 ### Fixed
 

instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo.go

@@ -6,13 +6,14 @@ package otelmongo // import "go.opentelemetry.io/contrib/instrumentation/go.mong
 import (
 	"context"
 	"fmt"
+	"net"
 	"strconv"
 	"strings"
 	"sync"
 
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
-	semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 	"go.opentelemetry.io/otel/trace"
 
 	"go.mongodb.org/mongo-driver/bson"
@@ -37,18 +38,18 @@ func (m *monitor) Started(ctx context.Context, evt *event.CommandStartedEvent) {
 
 	attrs := []attribute.KeyValue{
 		semconv.DBSystemMongoDB,
-		semconv.DBOperation(evt.CommandName),
-		semconv.DBName(evt.DatabaseName),
-		semconv.NetPeerName(hostname),
-		semconv.NetPeerPort(port),
-		semconv.NetTransportTCP,
+		semconv.DBOperationName(evt.CommandName),
+		semconv.DBNamespace(evt.DatabaseName),
+		semconv.NetworkPeerAddress(net.JoinHostPort(hostname, strconv.Itoa(port))),
+		semconv.NetworkPeerPort(port),
+		semconv.NetworkTransportTCP,
 	}
 	if !m.cfg.CommandAttributeDisabled {
-		attrs = append(attrs, semconv.DBStatement(sanitizeCommand(evt.Command)))
+		attrs = append(attrs, semconv.DBQueryText(sanitizeCommand(evt.Command)))
 	}
 	if collection, err := extractCollection(evt); err == nil && collection != "" {
 		spanName = collection + "."
-		attrs = append(attrs, semconv.DBMongoDBCollection(collection))
+		attrs = append(attrs, semconv.DBCollectionName(collection))
 	}
 	spanName += evt.CommandName
 	opts := []trace.SpanStartOption{

instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go

@@ -30,10 +30,10 @@ func TestDBCrudOperation(t *testing.T) {
 			return assert.Equal(t, "test-collection.insert", s.Name(), "expected %s", s.Name())
 		},
 		func(s sdktrace.ReadOnlySpan) bool {
-			return assert.Contains(t, s.Attributes(), attribute.String("db.operation", "insert"))
+			return assert.Contains(t, s.Attributes(), attribute.String("db.operation.name", "insert"))
 		},
 		func(s sdktrace.ReadOnlySpan) bool {
-			return assert.Contains(t, s.Attributes(), attribute.String("db.mongodb.collection", "test-collection"))
+			return assert.Contains(t, s.Attributes(), attribute.String("db.collection.name", "test-collection"))
 		},
 		func(s sdktrace.ReadOnlySpan) bool {
 			return assert.Equal(t, codes.Unset, s.Status().Code)
@@ -56,7 +56,7 @@ func TestDBCrudOperation(t *testing.T) {
 			excludeCommand: false,
 			validators: append(commonValidators, func(s sdktrace.ReadOnlySpan) bool {
 				for _, attr := range s.Attributes() {
-					if attr.Key == "db.statement" {
+					if attr.Key == "db.query.text" {
 						return assert.Contains(t, attr.Value.AsString(), `"test-item":"test-value"`)
 					}
 				}
@@ -72,7 +72,7 @@ func TestDBCrudOperation(t *testing.T) {
 			excludeCommand: true,
 			validators: append(commonValidators, func(s sdktrace.ReadOnlySpan) bool {
 				for _, attr := range s.Attributes() {
-					if attr.Key == "db.statement" {
+					if attr.Key == "db.query.text" {
 						return false
 					}
 				}
@@ -131,10 +131,10 @@ func TestDBCrudOperation(t *testing.T) {
 			assert.Equal(mt, trace.SpanKindClient, s.SpanKind())
 			attrs := s.Attributes()
 			assert.Contains(mt, attrs, attribute.String("db.system", "mongodb"))
-			assert.Contains(mt, attrs, attribute.String("net.peer.name", "<mock_connection>"))
-			assert.Contains(mt, attrs, attribute.Int64("net.peer.port", int64(27017)))
-			assert.Contains(mt, attrs, attribute.String("net.transport", "ip_tcp"))
-			assert.Contains(mt, attrs, attribute.String("db.name", "test-database"))
+			assert.Contains(mt, attrs, attribute.String("network.peer.address", "<mock_connection>:27017"))
+			assert.Contains(mt, attrs, attribute.Int64("network.peer.port", int64(27017)))
+			assert.Contains(mt, attrs, attribute.String("network.transport", "tcp"))
+			assert.Contains(mt, attrs, attribute.String("db.namespace", "test-database"))
 			for _, v := range tc.validators {
 				assert.True(mt, v(s))
 			}
@@ -160,10 +160,10 @@ func TestDBCollectionAttribute(t *testing.T) {
 					return assert.Equal(t, "test-collection.delete", s.Name())
 				},
 				func(s sdktrace.ReadOnlySpan) bool {
-					return assert.Contains(t, s.Attributes(), attribute.String("db.operation", "delete"))
+					return assert.Contains(t, s.Attributes(), attribute.String("db.operation.name", "delete"))
 				},
 				func(s sdktrace.ReadOnlySpan) bool {
-					return assert.Contains(t, s.Attributes(), attribute.String("db.mongodb.collection", "test-collection"))
+					return assert.Contains(t, s.Attributes(), attribute.String("db.collection.name", "test-collection"))
 				},
 				func(s sdktrace.ReadOnlySpan) bool {
 					return assert.Equal(t, codes.Unset, s.Status().Code)
@@ -186,7 +186,7 @@ func TestDBCollectionAttribute(t *testing.T) {
 					return assert.Equal(t, "listCollections", s.Name())
 				},
 				func(s sdktrace.ReadOnlySpan) bool {
-					return assert.Contains(t, s.Attributes(), attribute.String("db.operation", "listCollections"))
+					return assert.Contains(t, s.Attributes(), attribute.String("db.operation.name", "listCollections"))
 				},
 				func(s sdktrace.ReadOnlySpan) bool {
 					return assert.Equal(t, codes.Unset, s.Status().Code)
@@ -238,10 +238,10 @@ func TestDBCollectionAttribute(t *testing.T) {
 			assert.Equal(mt, trace.SpanKindClient, s.SpanKind())
 			attrs := s.Attributes()
 			assert.Contains(mt, attrs, attribute.String("db.system", "mongodb"))
-			assert.Contains(mt, attrs, attribute.String("net.peer.name", "<mock_connection>"))
-			assert.Contains(mt, attrs, attribute.Int64("net.peer.port", int64(27017)))
-			assert.Contains(mt, attrs, attribute.String("net.transport", "ip_tcp"))
-			assert.Contains(mt, attrs, attribute.String("db.name", "test-database"))
+			assert.Contains(mt, attrs, attribute.String("network.peer.address", "<mock_connection>:27017"))
+			assert.Contains(mt, attrs, attribute.Int64("network.peer.port", int64(27017)))
+			assert.Contains(mt, attrs, attribute.String("network.transport", "tcp"))
+			assert.Contains(mt, attrs, attribute.String("db.namespace", "test-database"))
 			for _, v := range tc.validators {
 				assert.True(mt, v(s))
 			}