@@ -62,15 +62,19 @@ Logging getLogging() {
62
62
@ Before
63
63
public void setUp () {}
64
64
65
- private final WriteOption [] defaultWriteOptions =
66
- new WriteOption [] {
67
- WriteOption .logName ("java.log" ),
68
- WriteOption .resource (
69
- MonitoredResource .newBuilder ("global" )
70
- .setLabels (
71
- new ImmutableMap .Builder <String , String >().put ("project_id" , projectId ).build ())
72
- .build ())
73
- };
65
+ private final WriteOption defaultWriteOptionLogName = WriteOption .logName ("java.log" );
66
+ // For local test runs, the default option is global
67
+ private final WriteOption defaultWriteOptionResourceGlobal = WriteOption .resource (
68
+ MonitoredResource .newBuilder ("global" )
69
+ .setLabels (
70
+ new ImmutableMap .Builder <String , String >().put ("project_id" , projectId ).build ())
71
+ .build ());
72
+ // CI runs on GCE so the default is gce_instance
73
+ private final WriteOption defaultWriteOptionResourceGCE = WriteOption .resource (
74
+ MonitoredResource .newBuilder ("gce_instance" )
75
+ .setLabels (
76
+ new ImmutableMap .Builder <String , String >().put ("project_id" , projectId ).build ())
77
+ .build ());
74
78
75
79
@ Test
76
80
public void testFlushLevelConfigUpdatesLoggingFlushSeverity () {
@@ -179,8 +183,8 @@ public void testDefaultWriteOptionsHasExpectedDefaults() {
179
183
LoggingEvent loggingEvent = createLoggingEvent (Level .ERROR , timestamp .getSeconds ());
180
184
loggingAppender .doAppend (loggingEvent );
181
185
182
- assertThat (logNameArg .getValue ()).isEqualTo (defaultWriteOptions [ 0 ] );
183
- assertThat (resourceArg .getValue ()).isEqualTo ( defaultWriteOptions [ 1 ] );
186
+ assertThat (logNameArg .getValue ()).isEqualTo (defaultWriteOptionLogName );
187
+ assertThat (resourceArg .getValue ()).isAnyOf ( defaultWriteOptionResourceGlobal , defaultWriteOptionResourceGCE );
184
188
}
185
189
186
190
private LoggingEvent createLoggingEvent (Level level , long timestamp ) {
0 commit comments