Reporter refactoring, enum bugfixes in DTOs, changed install script

ObserverBuilder.dockerfile

@@ -6,5 +6,4 @@ RUN gradle :observer:build --no-daemon
 #FROM openjdk:14-alpine
 FROM adoptopenjdk/openjdk11-openj9:jdk-11.0.1.13-alpine-slim
 COPY --from=build /home/gradle/src/observer/build/libs/observer-*-all.jar observer.jar
-#COPY build/libs/bigquery-reporter-*-all.jar bigquery-reporter.jar
-CMD ["java", "-Dcom.sun.management.jmxremote", "-Xmx128m", "-jar", "observer.jar"]
+CMD ["java", "-jar", "observer.jar"]

README.md

@@ -10,13 +10,13 @@ Use docker to build and run the infrastructure
 
 If you want to use BigQuery Reporting service, you should obtain 
 a credential json file from GCP to your BigQuery copy it to the 
-directory you run the `docker-compose` as google_api_creedentials.json.
+directory you run the `docker-compose` as google_api_credentials.json.
 Then 
 
-    docker-compose up kafka mysql webtc_observer webtc_bigquery_reporter
+    docker-compose up kafka mysql webtc_observer webtc_reporter
 
 You can configure the [Observer](https://hub.docker.com/repository/docker/observertc/webrtc-observer), 
-and the [BigQuery Reporter](https://hub.docker.com/repository/docker/observertc/webrtc-bigquery-reporter) 
+and the [Reporter](https://hub.docker.com/repository/docker/observertc/webrtc-reporter) 
 via environment variables. 
 
 

ReporterBuilder.dockerfile

@@ -0,0 +1,8 @@
+FROM gradle:6.3-jdk14 AS build
+COPY --chown=gradle:gradle . /home/gradle/src
+WORKDIR /home/gradle/src
+RUN gradle :reporter:build --no-daemon 
+
+FROM openjdk:14-alpine
+COPY --from=build /home/gradle/src/reporter/build/libs/reporter-*-all.jar reporter.jar
+CMD ["java", "-Dcom.sun.management.jmxremote", "-Xmx128m", "-jar", "reporter.jar"]

common/src/main/java/org/observertc/webrtc/common/reports/AbstractReportProcessor.java

@@ -23,6 +23,7 @@ public abstract class AbstractReportProcessor<T> implements Function<Report, T>,
 		typeMap.put(OutboundRTPReport.class.getName(), ReportType.OUTBOUND_RTP_REPORT);
 		typeMap.put(ICELocalCandidateReport.class.getName(), ReportType.ICE_LOCAL_CANDIDATE_REPORT);
 		typeMap.put(ICERemoteCandidateReport.class.getName(), ReportType.ICE_REMOTE_CANDIDATE_REPORT);
+		typeMap.put(ICECandidatePairReport.class.getName(), ReportType.ICE_CANDIDATE_PAIR_REPORT);
 		typeMap.put(TrackReport.class.getName(), ReportType.TRACK_REPORT);
 		typeMap.put(MediaSourceReport.class.getName(), ReportType.MEDIA_SOURCE_REPORT);
 		typeMapper = Collections.unmodifiableMap(typeMap);
@@ -104,6 +105,6 @@ public T processICELocalCandidateReport(ICELocalCandidateReport report) {
 	public T processICERemoteCandidateReport(ICERemoteCandidateReport report) {
 		return null;
 	}
-	
-	
+
+
 }

docker-compose.yml

@@ -2,18 +2,18 @@ version: '3.3'
 services:
   webrtc_bigquery_reporter:
     container_name: docker_webrtc_bigquery_reporter
-    image: observertc/webrtc-bigquery-reporter:0.3-alpha
+    image: observertc/webrtc-reporter:0.3-alpha
     restart: always
     links:
       - kafka
     ports:
       - 9088:9888
     environment:
       - INITIAL_WAITING_TIME_IN_S=20
-      - REPORTSINK_BIGQUERY_PROJECT_NAME=observertc
-      - REPORTSINK_BIGQUERY_DATASET_NAME=WebRTC
-      - REPORTSINK_BIGQUERY_CREATE_DATASET_IF_NOT_EXISTS=False
-      - REPORTSINK_BIGQUERY_CREATE_TABLE_IF_NOT_EXISTS=True
+      - BIGQUERY_PROJECT_NAME=observertc
+      - BIGQUERY_DATASET_NAME=WebRTC
+      - BIGQUERY_CREATE_DATASET_IF_NOT_EXISTS=False
+      - BIGQUERY_CREATE_TABLE_IF_NOT_EXISTS=True
       - GOOGLE_APPLICATION_CREDENTIALS=bq_credential.json
       - APPLICATION_SERVER_PORT=9888
       - KAFKA_HOSTS=docker_kafka:29092
@@ -38,10 +38,12 @@ services:
       - DATABASE_USERNAME=root
       - DATABSE_PASSWORD=password
       - JDBC_URL=jdbc:mysql://mysqldb:3306/WebRTCObserver
+      - MICRONAUT_CONFIG_FILES=/observer-config.yml
     depends_on:
       - kafka
       - mysql
-
+    volumes:
+      - ./observer-config.yml:/observer-config.yml
   # Infrastructure behind the Observer
   zookeeper:
     container_name: docker_zookeeper