Removing no longer used metrics endpoints

ostelco · Oct 3, 2019 · 24ba2be · 24ba2be
1 parent 4016f74
commit 24ba2be
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 119 deletions.
diff --git a/analytics-grpc-api/README.md b/analytics-grpc-api/README.md
diff --git a/analytics-grpc-api/build.gradle.kts b/analytics-grpc-api/build.gradle.kts
diff --git a/analytics-grpc-api/src/main/proto/analytics.proto b/analytics-grpc-api/src/main/proto/analytics.proto
diff --git a/analytics-grpc-api/src/main/proto/prime_metrics.proto b/analytics-grpc-api/src/main/proto/prime_metrics.proto
diff --git a/docker-compose.esp.yaml b/docker-compose.esp.yaml
@@ -90,7 +90,6 @@ services:
     command: ["./wait_including_esps.sh"]
     environment:
       - OCS_GRPC_SERVER=ocs.dev.ostelco.org
-      - METRICS_GRPC_SERVER=metrics.dev.ostelco.org
       - SERVICE_FILE=prime-service-account.json
       - GOOGLE_CLOUD_PROJECT=${GCP_PROJECT_ID}
       - PUBSUB_EMULATOR_HOST=pubsub-emulator:8085

diff --git a/docker-compose.seagull.yaml b/docker-compose.seagull.yaml
@@ -51,7 +51,6 @@ services:
     environment:
       - DISABLE_TLS=true
       - OCS_GRPC_SERVER=prime:8082
-      - METRICS_GRPC_SERVER=prime:8083
       - SERVICE_FILE=prime-service-account.json
       - GOOGLE_CLOUD_PROJECT=${GCP_PROJECT_ID}
       - PUBSUB_EMULATOR_HOST=pubsub-emulator:8085

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -59,7 +59,6 @@ services:
     environment:
       - DISABLE_TLS=true
       - OCS_GRPC_SERVER=prime:8082
-      - METRICS_GRPC_SERVER=prime:8083
       - SERVICE_FILE=prime-service-account.json
       - GOOGLE_CLOUD_PROJECT=${GCP_PROJECT_ID}
       - PUBSUB_EMULATOR_HOST=pubsub-emulator:8085

diff --git a/ocsgw/docker-compose.yaml b/ocsgw/docker-compose.yaml
@@ -7,7 +7,6 @@ services:
     command: ["./start_dev.sh"]
     environment:
       - OCS_GRPC_SERVER=ocs.dev.oya.world
-      - METRICS_GRPC_SERVER=metrics.dev.oya.world
       - SERVICE_FILE=prime-service-account.json
       - GOOGLE_CLOUD_PROJECT=${GCP_PROJECT_ID}
       - PUBSUB_PROJECT_ID=${GCP_PROJECT_ID}

diff --git a/ocsgw/src/main/java/org/ostelco/ocsgw/OcsServer.kt b/ocsgw/src/main/java/org/ostelco/ocsgw/OcsServer.kt
@@ -164,8 +164,7 @@ object OcsServer {
             appConfig: AppConfig): GrpcDataSource =
             GrpcDataSource(
                     protobufDataSource,
-                    appConfig.grpcServer,
-                    appConfig.metricsServer)
+                    appConfig.grpcServer)
 
     private fun getPubSubDataSource(
             protobufDataSource: ProtobufDataSource,

diff --git a/ocsgw/src/main/java/org/ostelco/ocsgw/datasource/protobuf/GrpcDataSource.java b/ocsgw/src/main/java/org/ostelco/ocsgw/datasource/protobuf/GrpcDataSource.java
@@ -73,16 +73,14 @@ public class GrpcDataSource implements DataSource {
      */
     public GrpcDataSource(
             final ProtobufDataSource protobufDataSource,
-            final String ocsServerHostname,
-            final String metricsServerHostname) throws IOException {
+            final String ocsServerHostname) throws IOException {
 
         this.protobufDataSource = protobufDataSource;
 
         this.ocsServerHostname = ocsServerHostname;
 
         LOG.info("Created GrpcDataSource");
         LOG.info("ocsServerHostname : {}", ocsServerHostname);
-        LOG.info("metricsServerHostname : {}", metricsServerHostname);
 
         // Not using the standard GOOGLE_APPLICATION_CREDENTIALS for this
         // as we need to download the file using container credentials in

diff --git a/ocsgw/src/main/java/org/ostelco/ocsgw/utils/AppConfig.java b/ocsgw/src/main/java/org/ostelco/ocsgw/utils/AppConfig.java
@@ -65,10 +65,6 @@ public String getGrpcServer() {
         return getEnvProperty("OCS_GRPC_SERVER");
     }
 
-    public String getMetricsServer() {
-        return getEnvProperty("METRICS_GRPC_SERVER");
-    }
-
     public String getPubSubProjectId() {
         return getEnvProperty("PUBSUB_PROJECT_ID");
     }