Fix messaging.client_id

Author: laurit

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorTest.java

@@ -89,7 +89,7 @@ void shouldExtractAllAvailableAttributes(
         entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_CONVERSATION_ID, "42"));
     expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, 100L));
     expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE, 120L));
-    expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, "43"));
+    expectedEntries.add(entry(AttributeKey.stringKey("messaging.client_id"), "43"));
     expectedEntries.add(
         entry(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation.operationName()));
 

instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java

@@ -12,6 +12,7 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.singleton;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
@@ -184,7 +185,7 @@ protected static List<AttributeAssertion> sendAttributes(ProducerRecord<String,
                 equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, record.topic()),
                 equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"),
                 satisfies(
-                    MessagingIncubatingAttributes.MESSAGING_CLIENT_ID,
+                    AttributeKey.stringKey("messaging.client_id"),
                     stringAssert -> stringAssert.startsWith("producer")),
                 satisfies(
                     MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID,
@@ -209,7 +210,7 @@ protected static List<AttributeAssertion> receiveAttributes(String topic) {
                 equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, topic),
                 equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"),
                 satisfies(
-                    MessagingIncubatingAttributes.MESSAGING_CLIENT_ID,
+                    AttributeKey.stringKey("messaging.client_id"),
                     stringAssert -> stringAssert.startsWith("consumer")),
                 equalTo(MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)));
     if (Boolean.getBoolean("hasConsumerGroup")) {
@@ -228,7 +229,7 @@ protected static List<AttributeAssertion> processAttributes(
                 equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, record.topic()),
                 equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"),
                 satisfies(
-                    MessagingIncubatingAttributes.MESSAGING_CLIENT_ID,
+                    AttributeKey.stringKey("messaging.client_id"),
                     stringAssert -> stringAssert.startsWith("consumer")),
                 satisfies(
                     MessagingIncubatingAttributes.MESSAGING_DESTINATION_PARTITION_ID,