diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml
index fca85a43ab49..3f2ce1a2392b 100644
--- a/docs/instrumentation-list.yaml
+++ b/docs/instrumentation-list.yaml
@@ -3890,7 +3890,10 @@ libraries:
   google:
   - name: google-http-client-1.19
     description: This instrumentation enables HTTP client spans and HTTP client metrics
-      for Google HTTP Client requests.
+      for the Google HTTP Client.
+    semantic_conventions:
+    - HTTP_CLIENT_SPANS
+    - HTTP_CLIENT_METRICS
     library_link: https://github.com/googleapis/google-http-java-client
     source_path: instrumentation/google-http-client-1.19
     scope:
@@ -3960,8 +3963,11 @@ libraries:
   grails:
   - name: grails-3.0
     description: |
-      This instrumentation enriches existing HTTP server spans with HTTP route information, and optionally enables experimental controller spans for Grails applications.
+      This instrumentation enriches HTTP server spans with route information, and enables controller spans for Grails applications (controller spans are disabled by default).
     library_link: https://grails.apache.org/
+    features:
+    - HTTP_ROUTE
+    - CONTROLLER_SPANS
     source_path: instrumentation/grails-3.0
     scope:
       name: io.opentelemetry.grails-3.0
@@ -3984,7 +3990,9 @@ libraries:
           type: STRING
   graphql:
   - name: graphql-java-12.0
-    description: This instrumentation enables spans for GraphQL Java operations.
+    description: This instrumentation enables spans for GraphQL operations.
+    semantic_conventions:
+    - GRAPHQL_SERVER_SPANS
     library_link: https://www.graphql-java.com/
     source_path: instrumentation/graphql-java/graphql-java-12.0
     scope:
@@ -4017,7 +4025,9 @@ libraries:
         - name: graphql.operation.type
           type: STRING
   - name: graphql-java-20.0
-    description: This instrumentation enables spans for GraphQL Java operations.
+    description: This instrumentation enables spans for GraphQL operations.
+    semantic_conventions:
+    - GRAPHQL_SERVER_SPANS
     library_link: https://www.graphql-java.com/
     source_path: instrumentation/graphql-java/graphql-java-20.0
     minimum_java_version: 11
@@ -4076,7 +4086,10 @@ libraries:
   grizzly:
   - name: grizzly-2.3
     description: This instrumentation enables HTTP server spans and HTTP server metrics
-      for Grizzly applications.
+      for Grizzly.
+    semantic_conventions:
+    - HTTP_SERVER_SPANS
+    - HTTP_SERVER_METRICS
     library_link: https://javaee.github.io/grizzly/httpserverframework.html
     source_path: instrumentation/grizzly-2.3
     scope:
diff --git a/instrumentation/google-http-client-1.19/metadata.yaml b/instrumentation/google-http-client-1.19/metadata.yaml
index 7fb2d572d923..1ca07cc3e624 100644
--- a/instrumentation/google-http-client-1.19/metadata.yaml
+++ b/instrumentation/google-http-client-1.19/metadata.yaml
@@ -1,4 +1,7 @@
-description: This instrumentation enables HTTP client spans and HTTP client metrics for Google HTTP Client requests.
+description: This instrumentation enables HTTP client spans and HTTP client metrics for the Google HTTP Client.
+semantic_conventions:
+  - HTTP_CLIENT_SPANS
+  - HTTP_CLIENT_METRICS
 library_link: https://github.com/googleapis/google-http-java-client
 configurations:
   - name: otel.instrumentation.http.known-methods
diff --git a/instrumentation/grails-3.0/metadata.yaml b/instrumentation/grails-3.0/metadata.yaml
index 69b45bef56de..ed8e09aecde5 100644
--- a/instrumentation/grails-3.0/metadata.yaml
+++ b/instrumentation/grails-3.0/metadata.yaml
@@ -1,6 +1,9 @@
 description: >
-  This instrumentation enriches existing HTTP server spans with HTTP route information, and
-  optionally enables experimental controller spans for Grails applications.
+  This instrumentation enriches HTTP server spans with route information, and enables controller
+  spans for Grails applications (controller spans are disabled by default).
+features:
+  - HTTP_ROUTE
+  - CONTROLLER_SPANS
 library_link: https://grails.apache.org/
 configurations:
   - name: otel.instrumentation.common.experimental.controller-telemetry.enabled
diff --git a/instrumentation/graphql-java/graphql-java-12.0/metadata.yaml b/instrumentation/graphql-java/graphql-java-12.0/metadata.yaml
index 5bdb67a7e26e..50d056157dc5 100644
--- a/instrumentation/graphql-java/graphql-java-12.0/metadata.yaml
+++ b/instrumentation/graphql-java/graphql-java-12.0/metadata.yaml
@@ -1,4 +1,6 @@
-description: This instrumentation enables spans for GraphQL Java operations.
+description: This instrumentation enables spans for GraphQL operations.
+semantic_conventions:
+  - GRAPHQL_SERVER_SPANS
 library_link: https://www.graphql-java.com/
 configurations:
   - name: otel.instrumentation.graphql.query-sanitizer.enabled
diff --git a/instrumentation/graphql-java/graphql-java-20.0/metadata.yaml b/instrumentation/graphql-java/graphql-java-20.0/metadata.yaml
index 7601d5633894..4d027bda592a 100644
--- a/instrumentation/graphql-java/graphql-java-20.0/metadata.yaml
+++ b/instrumentation/graphql-java/graphql-java-20.0/metadata.yaml
@@ -1,4 +1,6 @@
-description: This instrumentation enables spans for GraphQL Java operations.
+description: This instrumentation enables spans for GraphQL operations.
+semantic_conventions:
+  - GRAPHQL_SERVER_SPANS
 library_link: https://www.graphql-java.com/
 configurations:
   - name: otel.instrumentation.graphql.query-sanitizer.enabled
diff --git a/instrumentation/grizzly-2.3/metadata.yaml b/instrumentation/grizzly-2.3/metadata.yaml
index dcf6845fafac..0ca3fc8255c1 100644
--- a/instrumentation/grizzly-2.3/metadata.yaml
+++ b/instrumentation/grizzly-2.3/metadata.yaml
@@ -1,4 +1,7 @@
-description: This instrumentation enables HTTP server spans and HTTP server metrics for Grizzly applications.
+description: This instrumentation enables HTTP server spans and HTTP server metrics for Grizzly.
+semantic_conventions:
+  - HTTP_SERVER_SPANS
+  - HTTP_SERVER_METRICS
 library_link: https://javaee.github.io/grizzly/httpserverframework.html
 configurations:
   - name: otel.instrumentation.http.known-methods