Merge pull request #49 from SAP/fix-orgname

anklei · web-flow · commit e626102a87d4 · 2019-10-18T08:45:36.000+02:00
Fix cf org name and id, bump version to 3.0.5
diff --git a/README.md b/README.md
@@ -29,11 +29,11 @@ All in all, you should do the following:
 And
 4. Adjust your logging configuration accordingly.
 
-Let's say you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `3.0.4`):
+Let's say you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `3.0.5`):
 
 ```xml
 <properties>
-	<cf-logging-version>3.0.4</cf-logging-version>
+	<cf-logging-version>3.0.5</cf-logging-version>
 </properties>
 ```
 
diff --git a/cf-java-logging-support-core/pom.xml b/cf-java-logging-support-core/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.4</version>
+        <version>3.0.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>
diff --git a/cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/VcapEnvReader.java b/cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/VcapEnvReader.java
@@ -34,6 +34,8 @@ public class VcapEnvReader {
     private static final String CF_INSTANCE_INDEX = "instance_index";
     private static final String CF_SPACE_ID = "space_id";
     private static final String CF_SPACE_NAME = "space_name";
+    private static final String CF_ORGANIZATION_ID = "organization_id";
+    private static final String CF_ORGANIZATION_NAME = "organization_name";
 
     /*
      * for testing purposes only!
@@ -80,6 +82,8 @@ public static void getAppInfos(Map<String, String> tags, Set<String> envKeys) {
                 addField(tags, envKeys, envMap, CF_INSTANCE_INDEX, Fields.COMPONENT_INSTANCE);
                 addField(tags, envKeys, envMap, CF_SPACE_ID, Fields.SPACE_ID);
                 addField(tags, envKeys, envMap, CF_SPACE_NAME, Fields.SPACE_NAME);
+                addField(tags, envKeys, envMap, CF_ORGANIZATION_ID, Fields.ORGANIZATION_ID);
+                addField(tags, envKeys, envMap, CF_ORGANIZATION_NAME, Fields.ORGANIZATION_NAME);
             } catch (Exception ex) {
                 LoggerFactory.getLogger(VcapEnvReader.class).error("Cannot get infos from environment", ex);
                 return;
diff --git a/cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/EnvMap.java b/cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/EnvMap.java
@@ -8,19 +8,38 @@ public class EnvMap {
     public static final String VCAP_APP_ID = "867b99ba-1caa-4d91-b2ee-82982234f58a";
     public static final String VCAP_SPACE_NAME = "test-space";
     public static final String VCAP_SPACE_ID = "69ca5b0f-cc66-4f8e-9d17-f102f60142e2";
+    public static final String VCAP_ORGANIZATION_NAME = "test-org";
+    public static final String VCAP_ORGANIZATION_ID = "6b8cf2f9-bf9a-45f6-8774-0a0f42cb27f3";
     public static final String VCAP_INSTANCE_IDX = "0";
-
-    public static final String VCAP_APPLICATION = "{\"limits\":{\"mem\":256,\"disk\":1024,\"fds\":16384}, " +
-                                                  "\"application_version\":\"a9efcfae-ee23-465f-9985-401099500825\"," +
-                                                  "\"application_name\":\"" + VCAP_APP_NAME + "\"," +
-                                                  "\"application_uris\":[\"test-app.acme.org\"],\"version\":\"a9efcfae-ee23-465f-9985-401099500825\",\"name\":\"test-app\"," +
-                                                  "\"space_name\":\"" + VCAP_SPACE_NAME + "\"," + "\"space_id\":\"" +
-                                                  VCAP_SPACE_ID + "\"," +
-                                                  "\"uris\":[\"test-app.acme.org\"],\"users\":null," +
-                                                  "\"application_id\":\"" + VCAP_APP_ID + "\"," +
-                                                  "\"instance_id\":\"3b671ef5fd86407cb8807f303824c870\"," +
-                                                  "\"instance_index\":\"" + VCAP_INSTANCE_IDX + "\"," +
-                                                  "\"host\":\"0.0.0.0\",\"port\":61999,\"started_at\":\"2015-03-17 12:07:49 +0000\",\"started_at_timestamp\":1426594069,\"start\":\"2015-03-17 12:07:49 +0000\",\"state_timestamp\":1426594069}";
+    public static final String VCAP_APPLICATION = "{" +
+                                                  "\"application_id\":\"" + VCAP_APP_ID + "\", " +
+                                                  "\"application_name\":\"" + VCAP_APP_NAME + "\", " +
+                                                  "\"application_uris\":[  " +
+                                                  "\"testapp.testdomain.com\" " +
+                                                  "], " +
+                                                  "\"application_version\":\"92720bd3-2735-489d-bf4b-e5bb05c752e7\", " +
+                                                  "\"cf_api\":\"https://api.cf.sap.hana.ondemand.com\", " +
+                                                  "\"host\":\"0.0.0.0\", " +
+                                                  "\"instance_id\":\"34b12c70-5443-426f-75c4-3260\", " +
+                                                  "\"instance_index\":\"" + VCAP_INSTANCE_IDX + "\", " +
+                                                  "\"limits\":{  " +
+                                                  "\"disk\":1024, " +
+                                                  "\"fds\":16384, " +
+                                                  "\"mem\":1024 " +
+                                                  "}, " +
+                                                  "\"name\":\"d048888-logging-sample-app\", " +
+                                                  "\"organization_id\":\"" + VCAP_ORGANIZATION_ID + "\", " +
+                                                  "\"organization_name\":\"" + VCAP_ORGANIZATION_NAME + "\", " +
+                                                  "\"port\":8080, " +
+                                                  "\"process_id\":\"a6026141-8d69-4e9d-b62d-8e1d982f7953\", " +
+                                                  "\"process_type\":\"web\", " +
+                                                  "\"space_id\":\"" + VCAP_SPACE_ID + "\", " +
+                                                  "\"space_name\":\"" +VCAP_SPACE_NAME + "\", " +
+                                                  "\"uris\":[  " +
+                                                  "\"testapp.testdomain.com\" " +
+                                                  "], " +
+                                                  "\"version\":\"92720bd3-2735-489d-bf4b-e5bb05c752e7\" " +
+                                                  "}";
 
     public static final String NOT_SET = "not-set";
 
diff --git a/cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/TestVcapEnvReader.java b/cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/TestVcapEnvReader.java
@@ -20,6 +20,8 @@ public void testWithEnv() {
         assertTrue(tags.get(Fields.COMPONENT_INSTANCE).equals(EnvMap.VCAP_INSTANCE_IDX));
         assertTrue(tags.get(Fields.SPACE_ID).equals(EnvMap.VCAP_SPACE_ID));
         assertTrue(tags.get(Fields.SPACE_NAME).equals(EnvMap.VCAP_SPACE_NAME));
+        assertTrue(tags.get(Fields.ORGANIZATION_ID).equals(EnvMap.VCAP_ORGANIZATION_ID));
+        assertTrue(tags.get(Fields.ORGANIZATION_NAME).equals(EnvMap.VCAP_ORGANIZATION_NAME));
         VcapEnvReader.setEnvMap(null);
     }
 
@@ -34,6 +36,8 @@ public void testNoOverride() {
         assertTrue(tags.get(Fields.COMPONENT_INSTANCE).equals(EnvMap.VCAP_INSTANCE_IDX));
         assertTrue(tags.get(Fields.SPACE_ID).equals(EnvMap.VCAP_SPACE_ID));
         assertTrue(tags.get(Fields.SPACE_NAME).equals(EnvMap.VCAP_SPACE_NAME));
+        assertTrue(tags.get(Fields.ORGANIZATION_ID).equals(EnvMap.VCAP_ORGANIZATION_ID));
+        assertTrue(tags.get(Fields.ORGANIZATION_NAME).equals(EnvMap.VCAP_ORGANIZATION_NAME));
         VcapEnvReader.setEnvMap(null);
     }
 }
diff --git a/cf-java-logging-support-jersey/pom.xml b/cf-java-logging-support-jersey/pom.xml
@@ -9,7 +9,7 @@
 		<relativePath>../pom.xml</relativePath>
 		<groupId>com.sap.hcp.cf.logging</groupId>
 		<artifactId>cf-java-logging-support-parent</artifactId>
-		<version>3.0.4</version>
+		<version>3.0.5</version>
 	</parent>
 
 	<name>cf-java-logging-support-jersey</name>
diff --git a/cf-java-logging-support-log4j2/pom.xml b/cf-java-logging-support-log4j2/pom.xml
@@ -11,7 +11,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.4</version>
+        <version>3.0.5</version>
     </parent>
 
     <dependencies>
diff --git a/cf-java-logging-support-logback/pom.xml b/cf-java-logging-support-logback/pom.xml
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.4</version>
+        <version>3.0.5</version>
     </parent>
 
     <dependencies>
diff --git a/cf-java-logging-support-servlet/pom.xml b/cf-java-logging-support-servlet/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.sap.hcp.cf.logging</groupId>
 		<artifactId>cf-java-logging-support-parent</artifactId>
-		<version>3.0.4</version>
+		<version>3.0.5</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-core/pom.xml b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.hcp.cf.logging</groupId>
 		<artifactId>cf-java-monitoring-custom-metrics-clients</artifactId>
-		<version>3.0.4</version>
+		<version>3.0.5</version>
 	</parent>
 
 	<artifactId>cf-custom-metrics-clients-core</artifactId>
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/pom.xml b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.sap.hcp.cf.logging</groupId>
 		<artifactId>cf-java-monitoring-custom-metrics-clients</artifactId>
-		<version>3.0.4</version>
+		<version>3.0.5</version>
 	</parent>
 
 	<artifactId>cf-custom-metrics-clients-java</artifactId>
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-spring-boot/pom.xml b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-spring-boot/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-monitoring-custom-metrics-clients</artifactId>
-        <version>3.0.4</version>
+        <version>3.0.5</version>
     </parent>
 
     <artifactId>cf-custom-metrics-clients-spring-boot</artifactId>
diff --git a/cf-java-monitoring-custom-metrics-clients/pom.xml b/cf-java-monitoring-custom-metrics-clients/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.4</version>
+        <version>3.0.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.sap.hcp.cf.logging</groupId>
     <artifactId>cf-java-logging-support-parent</artifactId>
-    <version>3.0.4</version>
+    <version>3.0.5</version>
     <packaging>pom</packaging>
 
     <name>Cloud Foundry Java logging support components</name>
@@ -18,7 +18,7 @@
             <organizationUrl>https://github.com/SAP</organizationUrl>
         </developer>
         <developer>
-            <id>anklei</id>
+            <id>akl</id>
             <name>Andreas Klein</name>
             <email>andreas.klein@sap.com</email>
             <organization>SAP SE</organization>
@@ -86,6 +86,13 @@
            <organization>SAP SE</organization>
            <organizationUrl>https://github.com/SAP</organizationUrl>
        </developer>
+       <developer>
+           <id>HariG</id>
+           <name>Hariharan Gandhi</name>
+           <email>hariharan.gandhi@sap.com</email>
+           <organization>SAP SE</organization>
+           <organizationUrl>https://github.com/SAP</organizationUrl>
+       </developer>
     </developers>
 
     <licenses>
diff --git a/sample/manifest.yml b/sample/manifest.yml
@@ -5,7 +5,7 @@ applications:
 #
 - name: logging-sample-app
   instances: 1
-  path: target/logging-sample-app-3.0.4.war
+  path: target/logging-sample-app-3.0.5.war
   env:
     RANDOM_SLEEP: true
 # Set LOG_*: true to activate logging of respective field
diff --git a/sample/pom.xml b/sample/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.4</version>
+        <version>3.0.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ public void testWithEnv() {`
`20`	`20`	`assertTrue(tags.get(Fields.COMPONENT_INSTANCE).equals(EnvMap.VCAP_INSTANCE_IDX));`
`21`	`21`	`assertTrue(tags.get(Fields.SPACE_ID).equals(EnvMap.VCAP_SPACE_ID));`
`22`	`22`	`assertTrue(tags.get(Fields.SPACE_NAME).equals(EnvMap.VCAP_SPACE_NAME));`
	`23`	`+ assertTrue(tags.get(Fields.ORGANIZATION_ID).equals(EnvMap.VCAP_ORGANIZATION_ID));`
	`24`	`+ assertTrue(tags.get(Fields.ORGANIZATION_NAME).equals(EnvMap.VCAP_ORGANIZATION_NAME));`
`23`	`25`	`VcapEnvReader.setEnvMap(null);`
`24`	`26`	`}`
`25`	`27`
`@@ -34,6 +36,8 @@ public void testNoOverride() {`
`34`	`36`	`assertTrue(tags.get(Fields.COMPONENT_INSTANCE).equals(EnvMap.VCAP_INSTANCE_IDX));`
`35`	`37`	`assertTrue(tags.get(Fields.SPACE_ID).equals(EnvMap.VCAP_SPACE_ID));`
`36`	`38`	`assertTrue(tags.get(Fields.SPACE_NAME).equals(EnvMap.VCAP_SPACE_NAME));`
	`39`	`+ assertTrue(tags.get(Fields.ORGANIZATION_ID).equals(EnvMap.VCAP_ORGANIZATION_ID));`
	`40`	`+ assertTrue(tags.get(Fields.ORGANIZATION_NAME).equals(EnvMap.VCAP_ORGANIZATION_NAME));`
`37`	`41`	`VcapEnvReader.setEnvMap(null);`
`38`	`42`	`}`
`39`	`43`	`}`