aws-observability · lukeina2z · Oct 23, 2025 · Aug 22, 2025 · Sep 4, 2025 · Sep 22, 2025
@@ -18,4 +18,6 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t
 - Support X-Ray Trace Id extraction from Lambda Context object, and respect user-configured OTEL_PROPAGATORS in AWS Lamdba instrumentation
   ([#1191](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1191)) ([#1218](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1218))
 - Adaptive Sampling improvements: Ensure propagation of sampling rule across services and AWS accounts. Remove unnecessary B3 propagator.
-  ([#1201](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1201))
+  ([#1201](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1201))
+- Add support for new formal database semantic convention keys.
+  ([#1162](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1162))
@@ -15,6 +15,10 @@
 
 package software.amazon.opentelemetry.javaagent.providers;
 
+import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
+import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
+import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
+import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
 import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
 import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
 import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
@@ -26,7 +30,6 @@
 // https://github.com/open-telemetry/semantic-conventions-java/blob/release/v1.34.0/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DbIncubatingAttributes.java#L322-L327
 // They have been replaced with new keys:
 // https://github.com/open-telemetry/semantic-conventions-java/blob/release/v1.34.0/semconv/src/main/java/io/opentelemetry/semconv/DbAttributes.java#L77
-// TODO: Supporting new keys. Cannot do this now as new keys are not available in OTel Agent 2.11.
 // TODO: Delete deprecated keys once they no longer exist in binding version of the upstream code.
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
@@ -93,6 +96,7 @@
 import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.UNKNOWN_OPERATION;
 import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.UNKNOWN_REMOTE_OPERATION;
 import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.UNKNOWN_REMOTE_SERVICE;
+import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.getKeyValueWithFallback;
 import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.isAwsSDKSpan;
 import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.isDBSpan;
 import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.isKeyPresent;
@@ -285,11 +289,12 @@ private static void setRemoteServiceAndOperation(SpanData span, AttributesBuilde
       remoteOperation = getRemoteOperation(span, RPC_METHOD);
 
     } else if (isDBSpan(span)) {
-      remoteService = getRemoteService(span, DB_SYSTEM);
-      if (isKeyPresent(span, DB_OPERATION)) {
-        remoteOperation = getRemoteOperation(span, DB_OPERATION);
+      remoteService = getRemoteServiceWithFallback(span, DB_SYSTEM_NAME, DB_SYSTEM);
+      if (isKeyPresentWithFallback(span, DB_OPERATION_NAME, DB_OPERATION)) {
+        remoteOperation = getRemoteOperationWithFallback(span, DB_OPERATION_NAME, DB_OPERATION);
       } else {
-        remoteOperation = getDBStatementRemoteOperation(span, DB_STATEMENT);
+        String dbStatement = getKeyValueWithFallback(span, DB_QUERY_TEXT, DB_STATEMENT);
+        remoteOperation = getDBStatementRemoteOperation(span, dbStatement);
       }
     } else if (isKeyPresent(span, FAAS_INVOKED_NAME) || isKeyPresent(span, FAAS_TRIGGER)) {
       remoteService = getRemoteService(span, FAAS_INVOKED_NAME);
@@ -348,11 +353,8 @@ private static void setRemoteEnvironment(SpanData span, AttributesBuilder builde
    */
   private static String generateRemoteOperation(SpanData span) {
     String remoteOperation = UNKNOWN_REMOTE_OPERATION;
-    if (isKeyPresent(span, URL_FULL) || isKeyPresent(span, HTTP_URL)) {
-      String httpUrl =
-          isKeyPresent(span, URL_FULL)
-              ? span.getAttributes().get(URL_FULL)
-              : span.getAttributes().get(HTTP_URL);
+    if (isKeyPresentWithFallback(span, URL_FULL, HTTP_URL)) {
+      String httpUrl = getKeyValueWithFallback(span, URL_FULL, HTTP_URL);
       try {
         URL url;
         if (httpUrl != null) {
@@ -363,11 +365,8 @@ private static String generateRemoteOperation(SpanData span) {
         logger.log(Level.FINEST, "invalid http.url attribute: ", httpUrl);
       }
     }
-    if (isKeyPresent(span, HTTP_REQUEST_METHOD) || isKeyPresent(span, HTTP_METHOD)) {
-      String httpMethod =
-          isKeyPresent(span, HTTP_REQUEST_METHOD)
-              ? span.getAttributes().get(HTTP_REQUEST_METHOD)
-              : span.getAttributes().get(HTTP_METHOD);
+    if (isKeyPresentWithFallback(span, HTTP_REQUEST_METHOD, HTTP_METHOD)) {
+      String httpMethod = getKeyValueWithFallback(span, HTTP_REQUEST_METHOD, HTTP_METHOD);
       remoteOperation = httpMethod + " " + remoteOperation;
     }
     if (remoteOperation.equals(UNKNOWN_REMOTE_OPERATION)) {
@@ -791,7 +790,7 @@ private static Optional<String> getSnsResourceNameFromArn(Optional<String> strin
    * provided.
    */
   private static Optional<String> getDbConnection(SpanData span) {
-    String dbName = span.getAttributes().get(DB_NAME);
+    String dbName = getKeyValueWithFallback(span, DB_NAMESPACE, DB_NAME);
     Optional<String> dbConnection = Optional.empty();
 
     if (isKeyPresent(span, SERVER_ADDRESS)) {
@@ -949,6 +948,17 @@ private static String getRemoteService(SpanData span, AttributeKey<String> remot
     return remoteService;
   }
 
+  static String getRemoteServiceWithFallback(
+      SpanData span,
+      AttributeKey<String> remoteServiceKey,
+      AttributeKey<String> remoteServiceFallbackKey) {
+    String remoteService = span.getAttributes().get(remoteServiceKey);
+    if (remoteService == null) {
+      return getRemoteService(span, remoteServiceFallbackKey);
+    }
+    return remoteService;
+  }
+
   private static String getRemoteOperation(SpanData span, AttributeKey<String> remoteOperationKey) {
     String remoteOperation = span.getAttributes().get(remoteOperationKey);
     if (remoteOperation == null) {
@@ -972,9 +982,8 @@ static String getRemoteOperationWithFallback(
    * statement and compare to a regex list of known SQL keywords. The substring length is determined
    * by the longest known SQL keywords.
    */
-  private static String getDBStatementRemoteOperation(
-      SpanData span, AttributeKey<String> remoteOperationKey) {
-    String remoteOperation = span.getAttributes().get(remoteOperationKey);
+  private static String getDBStatementRemoteOperation(SpanData span, String dbStatement) {
+    String remoteOperation = dbStatement;
     if (remoteOperation == null) {
       remoteOperation = UNKNOWN_REMOTE_OPERATION;
     }

@@ -18,7 +18,7 @@
 import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
 import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_STATUS_CODE;
 import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_REMOTE_SERVICE;
-import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.isKeyPresent;
+import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.getKeyValueWithFallback;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.DoubleHistogram;
@@ -152,12 +152,8 @@ public boolean isEndRequired() {
   // possible except for the throttle
   // https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/awsxrayexporter/internal/translator/cause.go#L121-L160
   private void recordErrorOrFault(SpanData spanData, Attributes attributes) {
-    Long httpStatusCode = null;
-    if (isKeyPresent(spanData, HTTP_RESPONSE_STATUS_CODE)) {
-      httpStatusCode = spanData.getAttributes().get(HTTP_RESPONSE_STATUS_CODE);
-    } else if (isKeyPresent(spanData, HTTP_STATUS_CODE)) {
-      httpStatusCode = spanData.getAttributes().get(HTTP_STATUS_CODE);
-    }
+    Long httpStatusCode =
+        getKeyValueWithFallback(spanData, HTTP_RESPONSE_STATUS_CODE, HTTP_STATUS_CODE);
     StatusCode statusCode = spanData.getStatus().getStatusCode();
 
     if (httpStatusCode == null) {

@@ -15,6 +15,9 @@
 
 package software.amazon.opentelemetry.javaagent.providers;
 
+import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
+import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
+import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
 import static io.opentelemetry.semconv.UrlAttributes.URL_PATH;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
@@ -295,9 +298,9 @@ private static String generateIngressOperation(SpanData span) {
 
   // Check if the current Span adheres to database semantic conventions
   static boolean isDBSpan(SpanData span) {
-    return isKeyPresent(span, DB_SYSTEM)
-        || isKeyPresent(span, DB_OPERATION)
-        || isKeyPresent(span, DB_STATEMENT);
+    return isKeyPresentWithFallback(span, DB_SYSTEM_NAME, DB_SYSTEM)
+        || isKeyPresentWithFallback(span, DB_OPERATION_NAME, DB_OPERATION)
+        || isKeyPresentWithFallback(span, DB_QUERY_TEXT, DB_STATEMENT);
   }
 
   static boolean isLambdaServerSpan(ReadableSpan span) {