Upgrade kafa semconv to 1.26.0 (#909)

* Upgrade kafa semconv to 1.26.0 * Add changelog entry stub * Add PR number to changelog entry * Run go mod tidy * Update expected test output * Update verify.bats * Update CHANGELOG.md Co-authored-by: Ron Federman <[email protected]> --------- Co-authored-by: Ron Federman <[email protected]>
open-telemetry · Jul 9, 2024 · 927dfde · 927dfde
1 parent 6f99aef
commit 927dfde
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,12 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
 - Support `google.golang.org/grpc` `1.64.1`. ([#916](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/916))
 - Support `golang.org/x/net` `v0.27.0`. ([#917](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/917))
 
+### Changed
+
+- 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`
+
 ### Fixed
 
 - HTTP client: Use Host field in URL if the Request Host is not present. ([#888](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/888))

diff --git a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/probe.go b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/probe.go
@@ -16,10 +16,11 @@ package consumer
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/go-logr/logr"
 	"go.opentelemetry.io/otel/attribute"
-	semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/sys/unix"
 
@@ -122,8 +123,8 @@ func convertEvent(e *event) []*probe.SpanEvent {
 
 	attributes := []attribute.KeyValue{
 		semconv.MessagingSystemKafka,
-		semconv.MessagingOperationReceive,
-		semconv.MessagingKafkaDestinationPartition(int(e.Partition)),
+		semconv.MessagingOperationTypeReceive,
+		semconv.MessagingDestinationPartitionID(strconv.Itoa(int(e.Partition))),
 		semconv.MessagingDestinationName(topic),
 		semconv.MessagingKafkaMessageOffset(int(e.Offset)),
 		semconv.MessagingKafkaMessageKey(unix.ByteSliceToString(e.Key[:])),

diff --git a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/probe_test.go b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/probe_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"go.opentelemetry.io/otel/attribute"
-	semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 	"go.opentelemetry.io/otel/trace"
 
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/context"
@@ -63,8 +63,8 @@ func TestProbeConvertEvent(t *testing.T) {
 		SpanContext: &sc,
 		Attributes: []attribute.KeyValue{
 			semconv.MessagingSystemKafka,
-			semconv.MessagingOperationReceive,
-			semconv.MessagingKafkaDestinationPartition(12),
+			semconv.MessagingOperationTypeReceive,
+			semconv.MessagingDestinationPartitionID("12"),
 			semconv.MessagingDestinationName("topic1"),
 			semconv.MessagingKafkaMessageOffset(42),
 			semconv.MessagingKafkaMessageKey("key1"),

diff --git a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/probe.go b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/probe.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"go.opentelemetry.io/otel/attribute"
-	semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/sys/unix"
 
@@ -118,7 +118,7 @@ func convertEvent(e *event) []*probe.SpanEvent {
 
 	globalTopic := unix.ByteSliceToString(e.GlobalTopic[:])
 
-	var commonAttrs []attribute.KeyValue = []attribute.KeyValue{semconv.MessagingSystemKafka, semconv.MessagingOperationPublish}
+	commonAttrs := []attribute.KeyValue{semconv.MessagingSystemKafka, semconv.MessagingOperationTypePublish}
 	if len(globalTopic) > 0 {
 		commonAttrs = append(commonAttrs, semconv.MessagingDestinationName(globalTopic))
 	}

diff --git a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/probe_test.go b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/probe_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"go.opentelemetry.io/otel/attribute"
-	semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 	"go.opentelemetry.io/otel/trace"
 
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/probe"
@@ -75,7 +75,7 @@ func TestProbeConvertEvent(t *testing.T) {
 			semconv.MessagingKafkaMessageKey("key1"),
 			semconv.MessagingDestinationName("topic1"),
 			semconv.MessagingSystemKafka,
-			semconv.MessagingOperationPublish,
+			semconv.MessagingOperationTypePublish,
 			semconv.MessagingBatchMessageCount(2),
 		},
 	}
@@ -89,7 +89,7 @@ func TestProbeConvertEvent(t *testing.T) {
 			semconv.MessagingKafkaMessageKey("key2"),
 			semconv.MessagingDestinationName("topic2"),
 			semconv.MessagingSystemKafka,
-			semconv.MessagingOperationPublish,
+			semconv.MessagingOperationTypePublish,
 			semconv.MessagingBatchMessageCount(2),
 		},
 	}

diff --git a/internal/test/e2e/kafka-go/traces.json b/internal/test/e2e/kafka-go/traces.json
@@ -76,7 +76,7 @@
                   }
                 },
                 {
-                  "key": "messaging.operation",
+                  "key": "messaging.operation.type",
                   "value": {
                     "stringValue": "publish"
                   }
@@ -117,7 +117,7 @@
                   }
                 },
                 {
-                  "key": "messaging.operation",
+                  "key": "messaging.operation.type",
                   "value": {
                     "stringValue": "publish"
                   }
@@ -205,15 +205,15 @@
                   }
                 },
                 {
-                  "key": "messaging.operation",
+                  "key": "messaging.operation.type",
                   "value": {
                     "stringValue": "receive"
                   }
                 },
                 {
-                  "key": "messaging.kafka.destination.partition",
+                  "key": "messaging.destination.partition.id",
                   "value": {
-                    "intValue": "0"
+                    "stringValue": "0"
                   }
                 },
                 {

diff --git a/internal/test/e2e/kafka-go/verify.bats b/internal/test/e2e/kafka-go/verify.bats
@@ -44,8 +44,8 @@ SCOPE="go.opentelemetry.io/auto/github.com/segmentio/kafka-go"
   assert_equal "$topics" '"key1"'
 }
 
-@test "consumer :: valid {messaging.kafka.destination.partition}" {
-  partition=$(consumer_span_attributes_for ${SCOPE} | jq "select(.key == \"messaging.kafka.destination.partition\").value.intValue" | sort )
+@test "consumer :: valid {messaging.destination.partition.id}" {
+  partition=$(consumer_span_attributes_for ${SCOPE} | jq "select(.key == \"messaging.destination.partition.id\").value.stringValue" | sort )
   assert_equal "$partition" '"0"'
 }