Skip to content

Commit 8cd6b19

Browse files
jabubakejabubake
committed
refactoring package, classname
1 parent 4348833 commit 8cd6b19

3 files changed

Lines changed: 32 additions & 21 deletions

File tree

‎google-cloud-contrib/google-cloud-logging-logback/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Logback Appender for Google Cloud Logging
22
=========================================
33

4-
Logback appender `com.google.cloud.logging.CloudLoggingAppender` for
4+
Logback appender `com.google.cloud.logging.logback.LoggingAppender` for
55
[Google Cloud Logging](https://cloud.google.com/logging/).
66

77
This library allows you to use [Logback](https://logback.qos.ch/) configuration and the [Slf4j](https://www.slf4j.org/) interface to log via Google Cloud logging
@@ -41,7 +41,7 @@ See [Logback filters](https://logback.qos.ch/manual/filters.html#thresholdFilter
4141

4242
```xml
4343
<configuration>
44-
<appender name="CLOUD" class="com.google.cloud.logging.LogbackAppender">
44+
<appender name="CLOUD" class="com.google.cloud.logging.logback.LoggingAppender">
4545
<!-- Optional : filter logs at or above a level -->
4646
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
4747
<level>INFO</level>

google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/LogbackAppender.java renamed to google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,20 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.logging;
17+
package com.google.cloud.logging.logback;
1818

1919
import ch.qos.logback.classic.Level;
2020
import ch.qos.logback.classic.spi.ILoggingEvent;
2121
import ch.qos.logback.core.UnsynchronizedAppenderBase;
2222
import com.google.cloud.MonitoredResource;
23+
import com.google.cloud.logging.LogEntry;
24+
import com.google.cloud.logging.Logging;
2325
import com.google.cloud.logging.Logging.WriteOption;
26+
import com.google.cloud.logging.LoggingEnhancer;
27+
import com.google.cloud.logging.LoggingOptions;
28+
import com.google.cloud.logging.MonitoredResourceUtil;
29+
import com.google.cloud.logging.Payload;
30+
import com.google.cloud.logging.Severity;
2431

2532
import java.util.ArrayList;
2633
import java.util.Collections;
@@ -31,7 +38,7 @@
3138
*
3239
* <p>Appender configuration in logback.xml:
3340
* <ul>
34-
* <li>&lt;appender name="CLOUD" class="com.google.cloud.logging.LogbackAppender"&gt;</li>
41+
* <li>&lt;appender name="CLOUD" class="com.google.cloud.logging.logback.LoggingAppender"&gt;</li>
3542
* <li>&lt;log&gt;application.log&lt;/log&gt; (Optional, defaults to "java.log" : Stackdriver log name)</li>
3643
* <li>&lt;level&gt;ERROR&lt;/level&gt; (Optional, defaults to "INFO" : logs at or above this level)</li>
3744
* <li>&lt;flushLevel&gt;WARNING&lt;/flushLevel&gt; (Optional, defaults to "ERROR")</li>
@@ -44,7 +51,7 @@
4451
* <li>&lt;/appender&gt;</li>
4552
* </ul>
4653
*/
47-
public class LogbackAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
54+
public class LoggingAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
4855

4956
private static final String LEVEL_NAME_KEY = "levelName";
5057
private static final String LEVEL_VALUE_KEY = "levelValue";

google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/LogbackAppenderTest.java renamed to google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.logging;
17+
package com.google.cloud.logging.logback;
1818

1919
import static org.mockito.ArgumentMatchers.any;
2020
import static org.mockito.Mockito.doReturn;
@@ -28,7 +28,11 @@
2828
import ch.qos.logback.classic.spi.LoggingEvent;
2929
import com.google.cloud.MonitoredResource;
3030
import com.google.cloud.Timestamp;
31+
import com.google.cloud.logging.LogEntry;
32+
import com.google.cloud.logging.Logging;
3133
import com.google.cloud.logging.Logging.WriteOption;
34+
import com.google.cloud.logging.Payload;
35+
import com.google.cloud.logging.Severity;
3236
import com.google.common.collect.ImmutableMap;
3337
import org.junit.Before;
3438
import org.junit.Test;
@@ -38,11 +42,11 @@
3842
import java.util.Collections;
3943

4044
@RunWith(MockitoJUnitRunner.class)
41-
public class LogbackAppenderTest {
45+
public class LoggingAppenderTest {
4246

4347
private final String projectId = "test-project";
4448

45-
private final LogbackAppender logbackAppender = spy(LogbackAppender.class);
49+
private final LoggingAppender loggingAppender = spy(LoggingAppender.class);
4650
private final Logging logging = mock(Logging.class);
4751
private final WriteOption[] defaultWriteOptions = new WriteOption[] {
4852
WriteOption.logName("java.log"),
@@ -54,19 +58,19 @@ public class LogbackAppenderTest {
5458

5559
@Before
5660
public void setUp() {
57-
doReturn(logging).when(logbackAppender).getLogging();
58-
doReturn("test-project").when(logbackAppender).getProjectId();
59-
logbackAppender.start();
61+
doReturn(logging).when(loggingAppender).getLogging();
62+
doReturn("test-project").when(loggingAppender).getProjectId();
63+
loggingAppender.start();
6064
}
6165

6266
@Test
6367
public void testFlushLevelConfigUpdatesLoggingFlushSeverity() {
6468
Timestamp timestamp = Timestamp.ofTimeSecondsAndNanos(100000, 0);
6569
LoggingEvent loggingEvent = createLoggingEvent(Level.WARN, timestamp.getSeconds());
6670
// error is the default, updating to debug for test
67-
logbackAppender.setFlushLevel(Level.WARN);
68-
logbackAppender.start(); // reloading config
69-
logbackAppender.doAppend(loggingEvent);
71+
loggingAppender.setFlushLevel(Level.WARN);
72+
loggingAppender.start(); // reloading config
73+
loggingAppender.doAppend(loggingEvent);
7074
verify(logging, times(1)).setFlushSeverity(Severity.WARNING);
7175
}
7276

@@ -78,22 +82,22 @@ public void testFilterLogsOnlyLogsAtOrAboveLogLevel() {
7882
ThresholdFilter thresholdFilter = new ThresholdFilter();
7983
thresholdFilter.setLevel("ERROR");
8084
thresholdFilter.start();
81-
logbackAppender.addFilter(thresholdFilter);
82-
logbackAppender.doAppend(loggingEvent1);
85+
loggingAppender.addFilter(thresholdFilter);
86+
loggingAppender.doAppend(loggingEvent1);
8387
verify(logging, times(0)).write(any(Iterable.class), any(WriteOption.class));
8488
LoggingEvent loggingEvent2 = createLoggingEvent(Level.ERROR, timestamp.getSeconds());
85-
logbackAppender.doAppend(loggingEvent2);
89+
loggingAppender.doAppend(loggingEvent2);
8690
verify(logging, times(1)).write(any(Iterable.class), any(WriteOption.class));
8791
}
8892

8993
@Test
9094
public void testEnhancersAddCorrectLabelsToLogEntries() {
91-
logbackAppender.setEnhancers("com.example.enhancers.TestLoggingEnhancer," +
95+
loggingAppender.setEnhancers("com.example.enhancers.TestLoggingEnhancer," +
9296
"com.example.enhancers.AnotherTestLoggingEnhancer");
93-
logbackAppender.start();
97+
loggingAppender.start();
9498
Timestamp timestamp = Timestamp.ofTimeSecondsAndNanos(100000, 0);
9599
LoggingEvent loggingEvent = createLoggingEvent(Level.WARN, timestamp.getSeconds());
96-
logbackAppender.doAppend(loggingEvent);
100+
loggingAppender.doAppend(loggingEvent);
97101
verify(logging, times(1)).write(
98102
Collections.singleton(
99103
LogEntry.newBuilder(Payload.StringPayload.of("this is a test"))
@@ -112,7 +116,7 @@ public void testEnhancersAddCorrectLabelsToLogEntries() {
112116
public void testLogEntryLevelAndLabelsAreAsExpected() {
113117
Timestamp timestamp = Timestamp.ofTimeSecondsAndNanos(100000, 0);
114118
LoggingEvent loggingEvent = createLoggingEvent(Level.ERROR, timestamp.getSeconds());
115-
logbackAppender.doAppend(loggingEvent);
119+
loggingAppender.doAppend(loggingEvent);
116120
verify(logging).write(
117121
Collections.singleton(
118122
LogEntry.newBuilder(Payload.StringPayload.of("this is a test"))

0 commit comments

Comments
 (0)