Skip to content

Commit f0f2d54

Browse files
committed
revert formatting changes
1 parent cb15cce commit f0f2d54

File tree

1 file changed

+32
-16
lines changed

1 file changed

+32
-16
lines changed

web/src/main/java/com/microsoft/applicationinsights/web/internal/correlation/TraceContextCorrelation.java

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ private TraceContextCorrelation() {}
5050
* @param response
5151
* @param requestTelemetry
5252
*/
53-
public static void resolveCorrelation(HttpServletRequest request, HttpServletResponse response, RequestTelemetry requestTelemetry) {
53+
public static void resolveCorrelation(HttpServletRequest request, HttpServletResponse response,
54+
RequestTelemetry requestTelemetry) {
5455

5556
try {
5657
if (request == null) {
@@ -80,7 +81,8 @@ public static void resolveCorrelation(HttpServletRequest request, HttpServletRes
8081

8182
// assign parent id
8283
if (incomingTraceparent != null) {
83-
requestTelemetry.getContext().getOperation().setParentId("|" + processedTraceParent.getTraceId() + "." + incomingTraceparent.getSpanId() + ".");
84+
requestTelemetry.getContext().getOperation().setParentId("|" + processedTraceParent.getTraceId() + "." +
85+
incomingTraceparent.getSpanId() + ".");
8486
} else {
8587
// set parentId only if not already set (legacy processing can set it)
8688
if (requestTelemetry.getContext().getOperation().getParentId() == null) {
@@ -103,7 +105,8 @@ public static void resolveCorrelation(HttpServletRequest request, HttpServletRes
103105
addTargetAppIdInResponseHeaderViaRequestContext(response);
104106

105107
} catch (java.lang.Exception e) {
106-
InternalLogger.INSTANCE.error("unable to perform correlation :%s", ExceptionUtils.getStackTrace(e));
108+
InternalLogger.INSTANCE.error("unable to perform correlation :%s", ExceptionUtils.
109+
getStackTrace(e));
107110
}
108111
}
109112

@@ -126,7 +129,8 @@ private static Traceparent extractIncomingTraceparent(HttpServletRequest request
126129
try {
127130
incomingTraceparent = Traceparent.fromString(traceparentList.get(0));
128131
} catch (Exception e) {
129-
InternalLogger.INSTANCE.error(String.format("Received invalid traceparent header with exception %s, distributed trace might be broken", ExceptionUtils.getStackTrace(e)));
132+
InternalLogger.INSTANCE.error(String.format("Received invalid traceparent header with exception %s, "
133+
+ "distributed trace might be broken", ExceptionUtils.getStackTrace(e)));
130134
}
131135
return incomingTraceparent;
132136
}
@@ -136,7 +140,8 @@ private static Traceparent extractIncomingTraceparent(HttpServletRequest request
136140
* @param incomingTraceparent
137141
* @return
138142
*/
139-
private static Traceparent processIncomingTraceparent(Traceparent incomingTraceparent, HttpServletRequest request) {
143+
private static Traceparent processIncomingTraceparent(Traceparent incomingTraceparent,
144+
HttpServletRequest request) {
140145

141146
Traceparent processedTraceparent = null;
142147

@@ -154,7 +159,8 @@ private static Traceparent processIncomingTraceparent(Traceparent incomingTracep
154159

155160
} else {
156161
// create outbound traceparent inheriting traceId, flags from parent.
157-
processedTraceparent = new Traceparent(0, incomingTraceparent.getTraceId(), null, incomingTraceparent.getTraceFlags());
162+
processedTraceparent = new Traceparent(0, incomingTraceparent.getTraceId(), null,
163+
incomingTraceparent.getTraceFlags());
158164
}
159165
return processedTraceparent;
160166
}
@@ -204,18 +210,21 @@ private static Tracestate getTracestate(HttpServletRequest request, Traceparent
204210
tracestate = Tracestate.fromString(StringUtils.join(tracestateList, ","));
205211
// add appId to it if it's resolved
206212
if (appId != null && !appId.isEmpty()) {
207-
tracestate = new Tracestate(tracestate, AZURE_TRACEPARENT_COMPONENT_INITIAL, appId);
213+
tracestate = new Tracestate(tracestate, AZURE_TRACEPARENT_COMPONENT_INITIAL,
214+
appId);
208215
}
209216

210217
} catch (Exception e) {
211-
InternalLogger.INSTANCE.error(String.format("Cannot parse incoming tracestate %s", ExceptionUtils.getStackTrace(e)));
218+
InternalLogger.INSTANCE.error(String.format("Cannot parse incoming tracestate %s",
219+
ExceptionUtils.getStackTrace(e)));
212220
try {
213221
// Pass new tracestate if received invalid tracestate
214222
if (appId != null && !appId.isEmpty()) {
215223
tracestate = new Tracestate(null, AZURE_TRACEPARENT_COMPONENT_INITIAL, appId);
216224
}
217225
} catch (Exception ex) {
218-
InternalLogger.INSTANCE.error(String.format("Cannot create default tracestate %s", ExceptionUtils.getStackTrace(ex)));
226+
InternalLogger.INSTANCE.error(String.format("Cannot create default tracestate %s",
227+
ExceptionUtils.getStackTrace(ex)));
219228
}
220229
}
221230
} else {
@@ -225,7 +234,8 @@ private static Tracestate getTracestate(HttpServletRequest request, Traceparent
225234
tracestate = new Tracestate(null, AZURE_TRACEPARENT_COMPONENT_INITIAL, appId);
226235
}
227236
} catch (Exception e) {
228-
InternalLogger.INSTANCE.error(String.format("cannot create default traceparent %s", ExceptionUtils.getStackTrace(e)));
237+
InternalLogger.INSTANCE.error(String.format("cannot create default traceparent %s",
238+
ExceptionUtils.getStackTrace(e)));
229239
}
230240
}
231241
return tracestate;
@@ -317,25 +327,31 @@ public static void resolveRequestSource(HttpServletRequest request, RequestTelem
317327
String tracestate = request.getHeader(TRACESTATE_HEADER_NAME);
318328
if (tracestate == null || tracestate.isEmpty()) {
319329

320-
if (isW3CBackCompatEnabled && request.getHeader(TelemetryCorrelationUtils.REQUEST_CONTEXT_HEADER_NAME) != null) {
321-
InternalLogger.INSTANCE.trace("Tracestate absent, In backward compatibility mode, will try to resolve request-context");
330+
if (isW3CBackCompatEnabled &&
331+
request.getHeader(TelemetryCorrelationUtils.REQUEST_CONTEXT_HEADER_NAME) != null) {
332+
InternalLogger.INSTANCE.trace("Tracestate absent, In backward compatibility mode, will try to resolve "
333+
+ "request-context");
322334
TelemetryCorrelationUtils.resolveRequestSource(request, requestTelemetry, instrumentationKey);
323335
return;
324336
}
325-
InternalLogger.INSTANCE.info("Skip resolving request source as the following header was not found: %s", TRACESTATE_HEADER_NAME);
337+
InternalLogger.INSTANCE.info("Skip resolving request source as the following header was not found: %s",
338+
TRACESTATE_HEADER_NAME);
326339
return;
327340
}
328341

329342
Tracestate incomingTracestate = Tracestate.fromString(tracestate);
330343

331-
String source = generateSourceTargetCorrelation(instrumentationKey, incomingTracestate.get(AZURE_TRACEPARENT_COMPONENT_INITIAL));
344+
String source = generateSourceTargetCorrelation(instrumentationKey,
345+
incomingTracestate.get(AZURE_TRACEPARENT_COMPONENT_INITIAL));
332346

333347
// Set the source of this request telemetry which would be equal to AppId of the caller if
334348
// it's different from current AppId or else null.
335349
requestTelemetry.setSource(source);
336350

337-
} catch (Exception ex) {
338-
InternalLogger.INSTANCE.error("Failed to resolve request source. Exception information: %s", ExceptionUtils.getStackTrace(ex));
351+
}
352+
catch(Exception ex) {
353+
InternalLogger.INSTANCE.error("Failed to resolve request source. Exception information: %s",
354+
ExceptionUtils.getStackTrace(ex));
339355
}
340356
}
341357

0 commit comments

Comments
 (0)