diff --git a/entity-types/infra-confluentcloudkafkatopic/tests/Metric.json b/entity-types/infra-confluentcloudkafkatopic/tests/Metric.json
index 457b27246..c1cb8a834 100644
--- a/entity-types/infra-confluentcloudkafkatopic/tests/Metric.json
+++ b/entity-types/infra-confluentcloudkafkatopic/tests/Metric.json
@@ -1,58 +1,101 @@
 [
   {
-    "confluent_kafka_server_consumer_lag_offsets": {
-      "type": "gauge",
-      "count": 352,
-      "sum": 0,
-      "min": 0,
-      "max": 0,
-      "latest": 0
+    "collector.name": "confluent-monitor",
+    "collector.version": "release-39",
+    "confluent.cloudProvider": "AWS",
+    "confluent.clusterBootstrapServers": "pkc-921jm.us-east-2.aws.confluent.cloud:9092",
+    "confluent.clusterId": "lkc-3kkndw",
+    "confluent.clusterName": "test_cluster",
+    "confluent.environment": "env-1nrgd5",
+    "confluent.kafka.server.metric.topic": "test-topic-conf-1",
+    "confluent.kafka.server.retained_bytes": {
+      "type": "summary",
+      "count": 1,
+      "sum": 1942860,
+      "min": 1942860,
+      "max": 1942860
     },
-    "consumer_group_id": "agent_actions_vortex_vortex-3_23456",
-    "description": "The lag between a group member's committed offset and the partition's high watermark.",
-    "endTimestamp": 1719554400000,
-    "http.scheme": "https",
-    "instrumentation.provider": "opentelemetry",
-    "kafka.cluster_name": "us-jurassic-dust",
-    "kafka_id": "lkc-knjjjv",
-    "metricName": "confluent_kafka_server_consumer_lag_offsets",
-    "net.host.name": "api.telemetry.confluent.cloud",
-    "net.host.port": "443",
-    "newrelic.source": "api.metrics.otlp",
-    "nr.dataPointCount": 352,
-    "otel.library.name": "",
-    "otel.library.version": "",
-    "service.instance.id": "api.telemetry.confluent.cloud:443",
-    "service.name": "confluent",
-    "timestamp": 1719532800000,
-    "topic": "agent_actions"
+    "confluent.metricNamespace": "confluent.kafka.server",
+    "confluent.region": "us-east-2",
+    "confluent.resourceGroup": "io.confluent.kafka.server",
+    "confluent.resourceId": "lkc-3kkndw",
+    "confluent.resourceType": "kafka.server",
+    "displayName": "test-topic-conf-1 (test_cluster)",
+    "endTimestamp": 1736440020000,
+    "instrumentation.provider": "confluent",
+    "metricName": "confluent.kafka.server.retained_bytes",
+    "newrelic.cloudIntegrations.integrationId": "107879",
+    "newrelic.cloudIntegrations.integrationName": "Confluent Kafka Resource",
+    "newrelic.cloudIntegrations.providerAccountId": "61124",
+    "newrelic.cloudIntegrations.providerAccountName": "sa-6v61z6",
+    "newrelic.cloudIntegrations.providerExternalId": "sa-6v61z6",
+    "newrelic.source": "metricAPI",
+    "timestamp": 1736439720000
   },
   {
-    "confluent_kafka_server_received_bytes": {
-      "type": "gauge",
-      "count": 312,
-      "sum": 293255,
-      "min": 0,
-      "max": 74103,
-      "latest": 2741
+    "collector.name": "confluent-monitor",
+    "collector.version": "release-39",
+    "confluent.cloudProvider": "AWS",
+    "confluent.clusterBootstrapServers": "pkc-921jm.us-east-2.aws.confluent.cloud:9092",
+    "confluent.clusterId": "lkc-3kkndw",
+    "confluent.clusterName": "test_cluster",
+    "confluent.environment": "env-1nrgd5",
+    "confluent.kafka.server.metric.topic": "test-topic-conf-1",
+    "confluent.kafka.server.retained_bytes": {
+      "type": "summary",
+      "count": 1,
+      "sum": 1942860,
+      "min": 1942860,
+      "max": 1942860
     },
-    "description": "The delta count of bytes of the customer's data received from the network. Each sample is the number of bytes received since the previous data sample. The count is sampled every 60 seconds.",
-    "endTimestamp": 1719554400000,
-    "http.scheme": "https",
-    "instrumentation.provider": "opentelemetry",
-    "kafka.cluster_name": "stg-rat-hole",
-    "kafka_id": "lkc-gx5zg1",
-    "metricName": "confluent_kafka_server_received_bytes",
-    "net.host.name": "api.telemetry.confluent.cloud",
-    "net.host.port": "443",
-    "newrelic.source": "api.metrics.otlp",
-    "nr.dataPointCount": 312,
-    "otel.library.name": "",
-    "otel.library.version": "",
-    "service.instance.id": "api.telemetry.confluent.cloud:443",
-    "service.name": "confluent",
-    "timestamp": 1719532800000,
-    "topic": "connect_account_data_2",
-    "unit": "bytes"
+    "confluent.metricNamespace": "confluent.kafka.server",
+    "confluent.region": "us-east-2",
+    "confluent.resourceGroup": "io.confluent.kafka.server",
+    "confluent.resourceId": "lkc-3kkndw",
+    "confluent.resourceType": "kafka.server",
+    "displayName": "test-topic-conf-1 (test_cluster)",
+    "endTimestamp": 1736439960000,
+    "instrumentation.provider": "confluent",
+    "metricName": "confluent.kafka.server.retained_bytes",
+    "newrelic.cloudIntegrations.integrationId": "107879",
+    "newrelic.cloudIntegrations.integrationName": "Confluent Kafka Resource",
+    "newrelic.cloudIntegrations.providerAccountId": "61124",
+    "newrelic.cloudIntegrations.providerAccountName": "sa-6v61z6",
+    "newrelic.cloudIntegrations.providerExternalId": "sa-6v61z6",
+    "newrelic.source": "metricAPI",
+    "timestamp": 1736439660000
+  },
+  {
+    "collector.name": "confluent-monitor",
+    "collector.version": "release-39",
+    "confluent.cloudProvider": "AWS",
+    "confluent.clusterBootstrapServers": "pkc-921jm.us-east-2.aws.confluent.cloud:9092",
+    "confluent.clusterId": "lkc-3kkndw",
+    "confluent.clusterName": "test_cluster",
+    "confluent.environment": "env-1nrgd5",
+    "confluent.kafka.server.metric.topic": "test-topic-conf-1",
+    "confluent.kafka.server.retained_bytes": {
+      "type": "summary",
+      "count": 1,
+      "sum": 1942860,
+      "min": 1942860,
+      "max": 1942860
+    },
+    "confluent.metricNamespace": "confluent.kafka.server",
+    "confluent.region": "us-east-2",
+    "confluent.resourceGroup": "io.confluent.kafka.server",
+    "confluent.resourceId": "lkc-3kkndw",
+    "confluent.resourceType": "kafka.server",
+    "displayName": "test-topic-conf-1 (test_cluster)",
+    "endTimestamp": 1736439900000,
+    "instrumentation.provider": "confluent",
+    "metricName": "confluent.kafka.server.retained_bytes",
+    "newrelic.cloudIntegrations.integrationId": "107879",
+    "newrelic.cloudIntegrations.integrationName": "Confluent Kafka Resource",
+    "newrelic.cloudIntegrations.providerAccountId": "61124",
+    "newrelic.cloudIntegrations.providerAccountName": "sa-6v61z6",
+    "newrelic.cloudIntegrations.providerExternalId": "sa-6v61z6",
+    "newrelic.source": "metricAPI",
+    "timestamp": 1736439600000
   }
 ]