Skip to content

Commit 3fa4686

Browse files
Neenu1995Neenu1995
committed
simplify logging
1 parent 43313f4 commit 3fa4686

3 files changed

Lines changed: 36 additions & 112 deletions

File tree

‎java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcContextProxy.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
132132
// Wrap execution in the context of the active connection for all non-bypassed methods
133133
try (BigQueryJdbcMdc.MdcCloseable mdc = BigQueryJdbcMdc.registerInstance(connectionId)) {
134134
if (LOG.isLoggable(Level.FINER)) {
135-
LOG.logp(
136-
Level.FINER,
137-
target.getClass().getName(),
138-
method.getName(),
139-
() ->
140-
String.format(
141-
"Entering: %s.%s()", interfaceType.getSimpleName(), method.getName()));
135+
LOG.logp(Level.FINER, target.getClass().getName(), method.getName(), "++enter++");
142136
}
143137

144138
Object result = method.invoke(target, args);
@@ -148,12 +142,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
148142
if (LOG.isLoggable(Level.FINER)
149143
&& !(java.sql.Connection.class.isAssignableFrom(interfaceType)
150144
&& "close".equals(method.getName()))) {
151-
LOG.logp(
152-
Level.FINER,
153-
target.getClass().getName(),
154-
method.getName(),
155-
() ->
156-
String.format("Exiting: %s.%s()", interfaceType.getSimpleName(), method.getName()));
145+
LOG.logp(Level.FINER, target.getClass().getName(), method.getName(), "++exit++");
157146
}
158147

159148
// Symmetrical Cascade: Dynamic ResultSet concrete classes are deliberately unproxied here.

‎java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcResultSetLogger.java‎

Lines changed: 33 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public BigQueryJdbcResultSetLogger(Class<?> clazz, String connectionId) {
5656

5757
@Override
5858
public void log(LogRecord record) {
59+
record.setSourceClassName(targetClassName);
5960
record.setThreadID((int) Thread.currentThread().getId());
6061
if (connectionId != null) {
6162
Object[] existingParams = record.getParameters();
@@ -71,169 +72,111 @@ public void log(LogRecord record) {
7172
super.log(record);
7273
}
7374

75+
private void logTrace(Level level, String methodName, String msg) {
76+
if (isLoggable(level)) {
77+
LogRecord record = new LogRecord(level, msg);
78+
record.setSourceMethodName(methodName);
79+
this.log(record);
80+
}
81+
}
82+
83+
private void logTrace(Level level, String methodName, Supplier<String> msgSupplier) {
84+
if (isLoggable(level)) {
85+
LogRecord record = new LogRecord(level, msgSupplier.get());
86+
record.setSourceMethodName(methodName);
87+
this.log(record);
88+
}
89+
}
90+
7491
/**
7592
* Log a message at Level.FINEST with predefined class name, method name and messageto avoid stack
7693
* trace parsing on the hot-path.
7794
*/
7895
public void finestTrace(String methodName) {
79-
if (isLoggable(Level.FINEST)) {
80-
LogRecord record = new LogRecord(Level.FINEST, "++enter++");
81-
record.setSourceClassName(targetClassName);
82-
record.setSourceMethodName(methodName);
83-
this.log(record);
84-
}
96+
logTrace(Level.FINEST, methodName, "++enter++");
8597
}
8698

8799
/**
88100
* Log a message at Level.FINEST with predefined class name and method name to avoid stack trace
89101
* parsing on the hot-path.
90102
*/
91103
public void finestTrace(String methodName, String msg) {
92-
if (isLoggable(Level.FINEST)) {
93-
LogRecord record = new LogRecord(Level.FINEST, msg);
94-
record.setSourceClassName(targetClassName);
95-
record.setSourceMethodName(methodName);
96-
this.log(record);
97-
}
104+
logTrace(Level.FINEST, methodName, msg);
98105
}
99106

100107
/** Log a formatted message at Level.FINEST with predefined class name and method name. */
101108
public void finestTrace(String methodName, String format, Object... args) {
102109
if (isLoggable(Level.FINEST)) {
103-
LogRecord record = new LogRecord(Level.FINEST, String.format(format, args));
104-
record.setSourceClassName(targetClassName);
105-
record.setSourceMethodName(methodName);
106-
this.log(record);
110+
logTrace(Level.FINEST, methodName, String.format(format, args));
107111
}
108112
}
109113

110114
/** Log a lazy message at Level.FINEST with predefined class name and method name. */
111115
public void finestTrace(String methodName, Supplier<String> msgSupplier) {
112-
if (isLoggable(Level.FINEST)) {
113-
LogRecord record = new LogRecord(Level.FINEST, msgSupplier.get());
114-
record.setSourceClassName(targetClassName);
115-
record.setSourceMethodName(methodName);
116-
this.log(record);
117-
}
116+
logTrace(Level.FINEST, methodName, msgSupplier);
118117
}
119118

120119
/** Log a message at Level.FINER with predefined class name and method name. */
121120
public void finerTrace(String methodName, String msg) {
122-
if (isLoggable(Level.FINER)) {
123-
LogRecord record = new LogRecord(Level.FINER, msg);
124-
record.setSourceClassName(targetClassName);
125-
record.setSourceMethodName(methodName);
126-
this.log(record);
127-
}
121+
logTrace(Level.FINER, methodName, msg);
128122
}
129123

130124
/** Log a formatted message at Level.FINER with predefined class name and method name. */
131125
public void finerTrace(String methodName, String format, Object... args) {
132126
if (isLoggable(Level.FINER)) {
133-
LogRecord record = new LogRecord(Level.FINER, String.format(format, args));
134-
record.setSourceClassName(targetClassName);
135-
record.setSourceMethodName(methodName);
136-
this.log(record);
127+
logTrace(Level.FINER, methodName, String.format(format, args));
137128
}
138129
}
139130

140131
/** Log a lazy message at Level.FINER with predefined class name and method name. */
141132
public void finerTrace(String methodName, Supplier<String> msgSupplier) {
142-
if (isLoggable(Level.FINER)) {
143-
LogRecord record = new LogRecord(Level.FINER, msgSupplier.get());
144-
record.setSourceClassName(targetClassName);
145-
record.setSourceMethodName(methodName);
146-
this.log(record);
147-
}
133+
logTrace(Level.FINER, methodName, msgSupplier);
148134
}
149135

150136
/** Log a message at Level.FINE with predefined class name and method name. */
151137
public void fineTrace(String methodName, String msg) {
152-
if (isLoggable(Level.FINE)) {
153-
LogRecord record = new LogRecord(Level.FINE, msg);
154-
record.setSourceClassName(targetClassName);
155-
record.setSourceMethodName(methodName);
156-
this.log(record);
157-
}
138+
logTrace(Level.FINE, methodName, msg);
158139
}
159140

160141
/** Log a formatted message at Level.FINE with predefined class name and method name. */
161142
public void fineTrace(String methodName, String format, Object... args) {
162143
if (isLoggable(Level.FINE)) {
163-
LogRecord record = new LogRecord(Level.FINE, String.format(format, args));
164-
record.setSourceClassName(targetClassName);
165-
record.setSourceMethodName(methodName);
166-
this.log(record);
144+
logTrace(Level.FINE, methodName, String.format(format, args));
167145
}
168146
}
169147

170148
/** Log a lazy message at Level.FINE with predefined class name and method name. */
171149
public void fineTrace(String methodName, Supplier<String> msgSupplier) {
172-
if (isLoggable(Level.FINE)) {
173-
LogRecord record = new LogRecord(Level.FINE, msgSupplier.get());
174-
record.setSourceClassName(targetClassName);
175-
record.setSourceMethodName(methodName);
176-
this.log(record);
177-
}
150+
logTrace(Level.FINE, methodName, msgSupplier);
178151
}
179152

180153
@Override
181154
public void finest(String msg) {
182-
if (isLoggable(Level.FINEST)) {
183-
LogRecord record = new LogRecord(Level.FINEST, msg);
184-
record.setSourceClassName(targetClassName);
185-
record.setSourceMethodName("unknown");
186-
this.log(record);
187-
}
155+
logTrace(Level.FINEST, "unknown", msg);
188156
}
189157

190158
@Override
191159
public void finest(Supplier<String> msgSupplier) {
192-
if (isLoggable(Level.FINEST)) {
193-
LogRecord record = new LogRecord(Level.FINEST, msgSupplier.get());
194-
record.setSourceClassName(targetClassName);
195-
record.setSourceMethodName("unknown");
196-
this.log(record);
197-
}
160+
logTrace(Level.FINEST, "unknown", msgSupplier);
198161
}
199162

200163
@Override
201164
public void finer(String msg) {
202-
if (isLoggable(Level.FINER)) {
203-
LogRecord record = new LogRecord(Level.FINER, msg);
204-
record.setSourceClassName(targetClassName);
205-
record.setSourceMethodName("unknown");
206-
this.log(record);
207-
}
165+
logTrace(Level.FINER, "unknown", msg);
208166
}
209167

210168
@Override
211169
public void finer(Supplier<String> msgSupplier) {
212-
if (isLoggable(Level.FINER)) {
213-
LogRecord record = new LogRecord(Level.FINER, msgSupplier.get());
214-
record.setSourceClassName(targetClassName);
215-
record.setSourceMethodName("unknown");
216-
this.log(record);
217-
}
170+
logTrace(Level.FINER, "unknown", msgSupplier);
218171
}
219172

220173
@Override
221174
public void fine(String msg) {
222-
if (isLoggable(Level.FINE)) {
223-
LogRecord record = new LogRecord(Level.FINE, msg);
224-
record.setSourceClassName(targetClassName);
225-
record.setSourceMethodName("unknown");
226-
this.log(record);
227-
}
175+
logTrace(Level.FINE, "unknown", msg);
228176
}
229177

230178
@Override
231179
public void fine(Supplier<String> msgSupplier) {
232-
if (isLoggable(Level.FINE)) {
233-
LogRecord record = new LogRecord(Level.FINE, msgSupplier.get());
234-
record.setSourceClassName(targetClassName);
235-
record.setSourceMethodName("unknown");
236-
this.log(record);
237-
}
180+
logTrace(Level.FINE, "unknown", msgSupplier);
238181
}
239182
}

‎java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryThreadFactory.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import com.google.api.core.InternalApi;
2020
import java.util.concurrent.ThreadFactory;
21-
import java.util.logging.Level;
22-
import java.util.logging.LogRecord;
2321

2422
@InternalApi
2523
class BigQueryThreadFactory implements ThreadFactory {
@@ -40,13 +38,7 @@ public BigQueryThreadFactory() {
4038
public Thread newThread(Runnable r) {
4139
Thread t = new Thread(r, threadPrefix + (++threadSerialNum)); // non thread safe increment
4240
t.setDaemon(true);
43-
if (LOG.isLoggable(Level.FINER)) {
44-
LogRecord record =
45-
new LogRecord(Level.FINER, String.format("New thread %s created.", t.getName()));
46-
record.setSourceClassName(BigQueryThreadFactory.class.getName());
47-
record.setSourceMethodName("newThread");
48-
LOG.log(record);
49-
}
41+
LOG.finer("New thread %s created.", t.getName());
5042
return t;
5143
}
5244
}

0 commit comments

Comments
 (0)