Upgrade DB semconv from v1.21.0 to v1.26.0 (#911)

* Upgrade DB semconv from v1.21.0 to v1.26.0 Replace `db.statement` with `db.query.text`. * Run go mod tidy * Add changelog entry * Update e2e test expected value * Update internal/test/e2e/databasesql/traces.json * Update verify.bats
open-telemetry · Jul 9, 2024 · 536e9a7 · 536e9a7
1 parent e26d3af
commit 536e9a7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,8 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
 - Upgrade semconv from `v1.24.0` to `v1.26.0` in `github.com/segmentio/kafka-go` instrumentation. ([#909](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/909))
   - The `messaging.operation` attribute key is renamed to `messaging.operation.type`.
   - The `messaging.kafka.destination.partition` key is renamed to `messaging.destination.partition.id`
+- Upgrade semconv from `v1.21.0` to `v1.26.0` in `database/sql` instrumentation. ([#911](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/911))
+  - The `db.statement` attribute key is renamed to `db.query.text`.
 - Upgrade semconv to `v1.26.0` in `net/http` instrumentation. ([#913](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/913))
 - Upgrade `go.opentelemetry.io/auto` semconv to `v1.26.0`. ([#914](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/914))
 

diff --git a/internal/pkg/instrumentation/bpf/database/sql/probe.go b/internal/pkg/instrumentation/bpf/database/sql/probe.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"go.opentelemetry.io/otel/attribute"
-	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/sys/unix"
 
@@ -100,7 +100,7 @@ func convertEvent(e *event) []*probe.SpanEvent {
 			EndTime:     int64(e.EndTime),
 			SpanContext: &sc,
 			Attributes: []attribute.KeyValue{
-				semconv.DBStatementKey.String(query),
+				semconv.DBQueryText(query),
 			},
 			ParentSpanContext: pscPtr,
 		},

diff --git a/internal/pkg/instrumentation/bpf/database/sql/probe_test.go b/internal/pkg/instrumentation/bpf/database/sql/probe_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"go.opentelemetry.io/otel/attribute"
-	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 	"go.opentelemetry.io/otel/trace"
 
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/context"
@@ -45,7 +45,7 @@ func TestProbeConvertEvent(t *testing.T) {
 		EndTime:     int64(end.UnixNano()),
 		SpanContext: &sc,
 		Attributes: []attribute.KeyValue{
-			semconv.DBStatementKey.String("SELECT * FROM foo"),
+			semconv.DBQueryText("SELECT * FROM foo"),
 		},
 	}
 	assert.Equal(t, want, got[0])

diff --git a/internal/test/e2e/databasesql/traces.json b/internal/test/e2e/databasesql/traces.json
@@ -58,7 +58,7 @@
             {
               "attributes": [
                 {
-                  "key": "db.statement",
+                  "key": "db.query.text",
                   "value": {
                     "stringValue": "SELECT * FROM contacts"
                   }

diff --git a/internal/test/e2e/databasesql/verify.bats b/internal/test/e2e/databasesql/verify.bats
@@ -4,8 +4,8 @@ load ../../test_helpers/utilities
 
 SCOPE="go.opentelemetry.io/auto/database/sql"
 
-@test "${SCOPE} :: includes db.statement attribute" {
-  result=$(span_attributes_for ${SCOPE} | jq "select(.key == \"db.statement\").value.stringValue")
+@test "${SCOPE} :: includes db.query.text attribute" {
+  result=$(span_attributes_for ${SCOPE} | jq "select(.key == \"db.query.text\").value.stringValue")
   assert_equal "$result" '"SELECT * FROM contacts"'
 }