fix: Wrong order of libraries info in instrumentation (#1196)

losalex · web-flow · commit c3942ea6a7ba · 2022-11-15T14:07:33.000-08:00
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
@@ -163,8 +163,7 @@ private static ListValue generateLibrariesList(
     }
     Struct libraryInfo = createInfoStruct(libraryName, libraryVersion);
     ListValue.Builder libraryList = ListValue.newBuilder();
-    // Append first the library info for this library
-    libraryList.addValues(Value.newBuilder().setStructValue(libraryInfo).build());
+    // First add instrumentation data of other libraries to a list if any
     if (existingLibraryList != null) {
       for (Value val : existingLibraryList.getValuesList()) {
         if (val.hasStructValue()) {
@@ -190,6 +189,8 @@ private static ListValue generateLibrariesList(
         }
       }
     }
+    // At last, append this library info to a list
+    libraryList.addValues(Value.newBuilder().setStructValue(libraryInfo).build());
     return libraryList.build();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,7 @@ private static ListValue generateLibrariesList(`
`163`	`163`	`}`
`164`	`164`	`Struct libraryInfo = createInfoStruct(libraryName, libraryVersion);`
`165`	`165`	`ListValue.Builder libraryList = ListValue.newBuilder();`
`166`		`- // Append first the library info for this library`
`167`		`- libraryList.addValues(Value.newBuilder().setStructValue(libraryInfo).build());`
	`166`	`+ // First add instrumentation data of other libraries to a list if any`
`168`	`167`	`if (existingLibraryList != null) {`
`169`	`168`	`for (Value val : existingLibraryList.getValuesList()) {`
`170`	`169`	`if (val.hasStructValue()) {`
`@@ -190,6 +189,8 @@ private static ListValue generateLibrariesList(`
`190`	`189`	`}`
`191`	`190`	`}`
`192`	`191`	`}`
	`192`	`+ // At last, append this library info to a list`
	`193`	`+ libraryList.addValues(Value.newBuilder().setStructValue(libraryInfo).build());`
`193`	`194`	`return libraryList.build();`
`194`	`195`	`}`
`195`	`196`