Merge pull request #13 from hypertrace/fix-env-conflicts

kotharironak · web-flow · commit fa37730e1302 · 2020-08-11T12:00:04.000+05:30
avoids name clashes between kube envs vs app envs
diff --git a/hypertrace-trace-enricher/src/main/resources/configs/common/application.conf b/hypertrace-trace-enricher/src/main/resources/configs/common/application.conf
@@ -52,9 +52,9 @@ enricher {
     class = "org.hypertrace.traceenricher.enrichment.enrichers.DefaultServiceEntityEnricher"
     entity.service.config = {
       host = localhost
-      host = ${?ENTITY_SERVICE_HOST}
+      host = ${?ENTITY_SERVICE_HOST_CONFIG}
       port = 50061
-      port = ${?ENTITY_SERVICE_PORT}
+      port = ${?ENTITY_SERVICE_PORT_CONFIG}
     }
     dependencies = ["ApiBoundaryTypeAttributeEnricher"]
   }
@@ -85,9 +85,9 @@ enricher {
     class = "org.hypertrace.traceenricher.enrichment.enrichers.BackendEntityEnricher"
     entity.service.config = {
       host = localhost
-      host = ${?ENTITY_SERVICE_HOST}
+      host = ${?ENTITY_SERVICE_HOST_CONFIG}
       port = 50061
-      port = ${?ENTITY_SERVICE_PORT}
+      port = ${?ENTITY_SERVICE_PORT_CONFIG}
     }
     dependencies = ["DefaultServiceEntityEnricher"]
   }
@@ -106,9 +106,9 @@ enricher {
     dependencies = ["DefaultServiceEntityEnricher", "ApiBoundaryTypeAttributeEnricher"]
     entity.service.config = {
       host = localhost
-      host = ${?ENTITY_SERVICE_HOST}
+      host = ${?ENTITY_SERVICE_HOST_CONFIG}
       port = 50061
-      port = ${?ENTITY_SERVICE_PORT}
+      port = ${?ENTITY_SERVICE_PORT_CONFIG}
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ enricher {`
`52`	`52`	`class = "org.hypertrace.traceenricher.enrichment.enrichers.DefaultServiceEntityEnricher"`
`53`	`53`	`entity.service.config = {`
`54`	`54`	`host = localhost`
`55`		`- host = ${?ENTITY_SERVICE_HOST}`
	`55`	`+ host = ${?ENTITY_SERVICE_HOST_CONFIG}`
`56`	`56`	`port = 50061`
`57`		`- port = ${?ENTITY_SERVICE_PORT}`
	`57`	`+ port = ${?ENTITY_SERVICE_PORT_CONFIG}`
`58`	`58`	`}`
`59`	`59`	`dependencies = ["ApiBoundaryTypeAttributeEnricher"]`
`60`	`60`	`}`
`@@ -85,9 +85,9 @@ enricher {`
`85`	`85`	`class = "org.hypertrace.traceenricher.enrichment.enrichers.BackendEntityEnricher"`
`86`	`86`	`entity.service.config = {`
`87`	`87`	`host = localhost`
`88`		`- host = ${?ENTITY_SERVICE_HOST}`
	`88`	`+ host = ${?ENTITY_SERVICE_HOST_CONFIG}`
`89`	`89`	`port = 50061`
`90`		`- port = ${?ENTITY_SERVICE_PORT}`
	`90`	`+ port = ${?ENTITY_SERVICE_PORT_CONFIG}`
`91`	`91`	`}`
`92`	`92`	`dependencies = ["DefaultServiceEntityEnricher"]`
`93`	`93`	`}`
`@@ -106,9 +106,9 @@ enricher {`
`106`	`106`	`dependencies = ["DefaultServiceEntityEnricher", "ApiBoundaryTypeAttributeEnricher"]`
`107`	`107`	`entity.service.config = {`
`108`	`108`	`host = localhost`
`109`		`- host = ${?ENTITY_SERVICE_HOST}`
	`109`	`+ host = ${?ENTITY_SERVICE_HOST_CONFIG}`
`110`	`110`	`port = 50061`
`111`		`- port = ${?ENTITY_SERVICE_PORT}`
	`111`	`+ port = ${?ENTITY_SERVICE_PORT_CONFIG}`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`