Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix failing instrumentation test preventing release #1187

Merged
merged 9 commits into from
Nov 7, 2022
Merged

fix: Fix failing instrumentation test preventing release #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
abc6434
fix: Fix failing instrumentation test preventing release
losalex Nov 7, 2022
5cdb32c
Fix comment
losalex Nov 7, 2022
b86e6a8
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Nov 7, 2022
42aaf81
Merge branch 'losalex/fix-tests' of https://github.com/googleapis/jav…
gcf-owl-bot[bot] Nov 7, 2022
3e90227
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Nov 7, 2022
b63b197
Merge branch 'losalex/fix-tests' of https://github.com/googleapis/jav…
gcf-owl-bot[bot] Nov 7, 2022
c73fb88
Merge branch 'main' into losalex/fix-tests
losalex Nov 7, 2022
f98c081
Merge branch 'losalex/fix-tests' of https://github.com/googleapis/jav…
losalex Nov 7, 2022
956f45f
Update comment
losalex Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ public final class Instrumentation {
public static final String INSTRUMENTATION_NAME_KEY = "name";
public static final String INSTRUMENTATION_VERSION_KEY = "version";
public static final String JAVA_LIBRARY_NAME_PREFIX = "java";
// Using release-please annotations to update DEFAULT_INSTRUMENTATION_VERSION with latest version.
// See
// https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
// {x-version-update-start:google-cloud-logging:current}
public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.13.0";
// {x-version-update-end}
Expand Down Expand Up @@ -233,7 +236,13 @@ public static String getLibraryVersion(Class<?> libraryClass) {
return libraryVersion;
}

private static String truncateValue(String value) {
/**
* Trancates given string to MAX_DIAGNOSTIC_VALUE_LENGTH and adds "*" instead of reduced suffix
*
* @param value {String} Value to be truncated
* @return The truncated string
*/
public static String truncateValue(String value) {
if (Strings.isNullOrEmpty(value) || value.length() < MAX_DIAGNOSTIC_VALUE_LENGTH) {
return value;
}
Expand Down
14 changes: 11 additions & 3 deletions google-cloud-logging/src/test/java/com/google/cloud/logging/InstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ public void testInstrumentationGenerated() {
1,
2,
new HashSet<>(Arrays.asList(Instrumentation.JAVA_LIBRARY_NAME_PREFIX)),
new HashSet<>(Arrays.asList(Instrumentation.getLibraryVersion(Instrumentation.class))));
new HashSet<>(
Arrays.asList(
Instrumentation.truncateValue(
Instrumentation.getLibraryVersion(Instrumentation.class)))));
}

@Test
Expand All @@ -78,7 +81,9 @@ public void testInstrumentationUpdated() {
new HashSet<>(Arrays.asList(Instrumentation.JAVA_LIBRARY_NAME_PREFIX, JAVA_OTHER_NAME)),
new HashSet<>(
Arrays.asList(
Instrumentation.getLibraryVersion(Instrumentation.class), JAVA_OTHER_VERSION)));
Instrumentation.truncateValue(
Instrumentation.getLibraryVersion(Instrumentation.class)),
JAVA_OTHER_VERSION)));
}

@Test
Expand All @@ -92,7 +97,10 @@ public void testInvalidInstrumentationRemoved() {
0,
1,
new HashSet<>(Arrays.asList(Instrumentation.JAVA_LIBRARY_NAME_PREFIX)),
new HashSet<>(Arrays.asList(Instrumentation.getLibraryVersion(Instrumentation.class))));
new HashSet<>(
Arrays.asList(
Instrumentation.truncateValue(
Instrumentation.getLibraryVersion(Instrumentation.class)))));
}

public static JsonPayload generateInstrumentationPayload(
Expand Down
3 changes: 2 additions & 1 deletion google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ public class LoggingHandlerTest {
LogEntry.newBuilder(
InstrumentationTest.generateInstrumentationPayload(
Instrumentation.JAVA_LIBRARY_NAME_PREFIX,
Instrumentation.getLibraryVersion(Instrumentation.class)))
Instrumentation.truncateValue(
Instrumentation.getLibraryVersion(Instrumentation.class))))
.setLogName(Instrumentation.INSTRUMENTATION_LOG_NAME)
.build();

Expand Down
3 changes: 2 additions & 1 deletion google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2333,7 +2333,8 @@ private void testDiagnosticInfoGeneration(boolean addPartialSuccessOption) {
LogEntry.newBuilder(
InstrumentationTest.generateInstrumentationPayload(
Instrumentation.JAVA_LIBRARY_NAME_PREFIX,
Instrumentation.getLibraryVersion(Instrumentation.class)))
Instrumentation.truncateValue(
Instrumentation.getLibraryVersion(Instrumentation.class))))
.setLogName(Instrumentation.INSTRUMENTATION_LOG_NAME)
.build();
WriteLogEntriesRequest request =
Expand Down