Merge pull request #12 from keyko-io/feature/update-records-to-postgres

Log records schemas to be compatible with postgres
keyko-io · Mar 24, 2020 · 2a92ade · 2a92ade
2 parents 1b4c663 + c7559bf
commit 2a92ade
Show file tree

Hide file tree

Showing 15 changed files with 267 additions and 275 deletions.
diff --git a/README.md b/README.md
@@ -38,19 +38,15 @@ You can include the stubs generated with the schemas including the following dep
 The AVRO implementation of the schemas can be found in the **src/main/resources/avro/** folder. This are the schemas implemented:
 
 * AlertRecord.avsc	
-* BlockDetailsRecord.avsc	
 * BlockRecord.avsc	
 * EventBlockRecord.avsc	
-* EventDetailsRecord.avsc	
 * EventRecord.avsc	
-* LogDetailsRecord.avsc
 * LogRecord.avsc
+* LogRecordTopicsFlattened.avsc
 * NumberParameter.avsc	
 * StringParameter.avsc	
 * TimeSeriesParameter.avsc	
 * TimeSeriesRecord.avsc	
-* TransactionDetailsRecord.avsc	
 * TransactionRecord.avsc	
 * ViewBlockRecord.avsc	
-* ViewDetailsRecord.avsc	
 * ViewRecord.avsc
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>io.keyko.monitoring</groupId>
     <artifactId>schemas</artifactId>
     <packaging>jar</packaging>
-    <version>0.2.6</version>
+    <version>0.3.0</version>
     <name>Web3 Monitoring Schemas</name>
     <url>https://github.com/keyko-io/web3-monitoring-schemas</url>
 
@@ -99,12 +99,14 @@
                                 <include>**/*.avsc</include>
                             </includes>
                             <imports>
+                                <import>${project.basedir}/src/main/resources/avro/ContractEventStatus.avsc</import>
                                 <import>${project.basedir}/src/main/resources/avro/NumberParameter.avsc</import>
                                 <import>${project.basedir}/src/main/resources/avro/StringParameter.avsc</import>
-                                <import>${project.basedir}/src/main/resources/avro/ViewDetailsRecord.avsc</import>
-                                <import>${project.basedir}/src/main/resources/avro/BlockDetailsRecord.avsc</import>
-                                <import>${project.basedir}/src/main/resources/avro/EventDetailsRecord.avsc</import>
-                                <import>${project.basedir}/src/main/resources/avro/TransactionDetailsRecord.avsc</import>
+                                <import>${project.basedir}/src/main/resources/avro/ViewRecord.avsc</import>
+                                <import>${project.basedir}/src/main/resources/avro/BlockRecord.avsc</import>
+                                <import>${project.basedir}/src/main/resources/avro/EventsRecord.avsc</import>
+                                <import>${project.basedir}/src/main/resources/avro/LogRecordRecord.avsc</import>
+                                <import>${project.basedir}/src/main/resources/avro/TransactionRecord.avsc</import>
                             </imports>
                         </configuration>
                     </execution>

diff --git a/src/main/resources/avro/BlockDetailsRecord.avsc b/src/main/resources/avro/BlockDetailsRecord.avsc
diff --git a/src/main/resources/avro/BlockRecord.avsc b/src/main/resources/avro/BlockRecord.avsc
@@ -7,12 +7,21 @@
 			"type": "string"
 		},
 		{
-			"name": "type",
+			"name": "number",
+			"type": "long"
+		},
+		{
+			"name": "hash",
 			"type": "string"
 		},
 		{
-			"name": "details",
-			"type": "BlockDetailsRecord"
+			"name": "timestamp",
+			"type": "long",
+			"logicalType": "timestamp-millis"
+		},
+		{
+			"name": "nodeName",
+			"type": "string"
 		},
 		{
 			"name": "retries",

diff --git a/src/main/resources/avro/ContractEventStatus.avsc b/src/main/resources/avro/ContractEventStatus.avsc
@@ -0,0 +1,19 @@
+{
+  "namespace": "io.keyko.monitoring.schemas",
+  "name": "ContractEventStatus",
+  "type": "record",
+  "fields": [
+    { "name": "status",
+      "type": {
+        "name": "statuses",
+        "type": "enum",
+        "symbols": [
+          "UNCONFIRMED",
+          "CONFIRMED",
+          "INVALIDATED"
+        ]
+      }
+    }
+  ]
+}
+
diff --git a/src/main/resources/avro/EventBlockRecord.avsc b/src/main/resources/avro/EventBlockRecord.avsc
@@ -7,16 +7,12 @@
 			"type": "string"
 		},
 		{
-			"name": "type",
-			"type": "string"
-		},
-		{
-			"name": "details",
-			"type": "EventDetailsRecord"
+			"name": "event",
+			"type": "EventRecord"
 		},
 		{
-			"name": "detailsBlock",
-			"type": "BlockDetailsRecord"
+			"name": "block",
+			"type": "BlockRecord"
 		},
 		{
 			"name": "retries",

diff --git a/src/main/resources/avro/EventDetailsRecord.avsc b/src/main/resources/avro/EventDetailsRecord.avsc
diff --git a/src/main/resources/avro/EventRecord.avsc b/src/main/resources/avro/EventRecord.avsc
@@ -7,12 +7,69 @@
 			"type": "string"
 		},
 		{
-			"name": "type",
+			"name": "name",
 			"type": "string"
 		},
 		{
-			"name": "details",
-			"type": "EventDetailsRecord"
+			"name": "contractName",
+			"type": "string",
+			"default": ""
+		},
+		{
+			"name": "filterId",
+			"type": "string"
+		},
+		{
+			"name": "nodeName",
+			"type": "string"
+		},
+		{
+			"name": "indexedParameters",
+			"type": {
+				"type": "array",
+				"items": ["StringParameter", "NumberParameter"]
+			}
+		},
+
+		{
+			"name": "nonIndexedParameters",
+			"type": {
+				"type": "array",
+				"items": ["StringParameter", "NumberParameter"]
+			}
+		},
+		{
+			"name": "transactionHash",
+			"type": "string"
+		},
+		{
+			"name": "logIndex",
+			"type": "string",
+			"java-class": "java.math.BigInteger"
+		},
+		{
+			"name": "blockNumber",
+			"type": "long"
+		},
+		{
+			"name": "blockHash",
+			"type": "string"
+		},
+		{
+			"name": "address",
+			"type": "string"
+		},
+		{
+			"name": "status",
+			"type": "ContractEventStatus"
+		},
+		{
+			"name": "eventSpecificationSignature",
+			"type": "string"
+		},
+		{
+			"name": "networkName",
+			"type": "string"
 		},
 		{
 			"name": "retries",

diff --git a/src/main/resources/avro/LogRecord.avsc b/src/main/resources/avro/LogRecord.avsc
@@ -7,12 +7,49 @@
 		"type": "string"
 		},
 		{
-			"name": "type",
+			"name": "nodeName",
 			"type": "string"
 		},
 		{
-			"name": "details",
-			"type": "LogDetailsRecord"
+			"name": "data",
+			"type":"string"
+		},
+		{
+			"name": "topics",
+			"type": {
+				"name": "topic",
+				"type": "array",
+				"items": "string"
+			}
+		},
+		{
+			"name": "transactionHash",
+			"type": "string"
+		},
+		{
+			"name": "logIndex",
+			"type": "string",
+			"java-class": "java.math.BigInteger"
+		},
+		{
+			"name": "blockNumber",
+			"type": "long"
+		},
+		{
+			"name": "blockHash",
+			"type": "string"
+		},
+		{
+			"name": "address",
+			"type": "string"
+		},
+		{
+			"name": "networkName",
+			"type": "string"
+		},
+		{
+			"name": "status",
+			"type": "ContractEventStatus"
 		},
 		{
 			"name": "retries",