Skip to content

Commit 70e1ebe

Browse files
author
Liudmila Molkova
authored
Tracing and log correlation without otel (#43718)
* log correlation and log-based tracing * cleanup attribute and event names * Retry policy logging clean up * redirect policy logging cleanup
1 parent d465082 commit 70e1ebe

File tree

120 files changed

+4376
-1755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+4376
-1755
lines changed

sdk/clientcore/core/checkstyle-suppressions.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@
66
<suppress files="io.clientcore.core.implementation.util.InternalContext.java" checks="JavadocMethodCheck" />
77
<suppress files="io.clientcore.core.implementation.http.rest.RequestDataConfiguration.java" checks="MissingJavadocMethodCheck" />
88
<suppress files="io.clientcore.core.implementation.http.rest.SwaggerMethodParser.java" checks="MissingJavadocMethodCheck" />
9-
<suppress files="io.clientcore.core.implementation.util.DefaultLogger.java" checks="MissingJavadocMethodCheck" />
9+
<suppress files="io.clientcore.core.implementation.instrumentation.DefaultLogger.java" checks="MissingJavadocMethodCheck" />
1010
<suppress files="io.clientcore.core.implementation.util.ImplUtils.java" checks="MissingJavadocMethodCheck" />
1111
<suppress files="io.clientcore.core.implementation.util.IterableOfByteBuffersInputStream.java" checks="MissingJavadocMethodCheck" />
1212
<suppress files="io.clientcore.core.implementation.util.ServerSentEventHelper.java" checks="MissingJavadocMethodCheck" />
13-
<suppress files="io.clientcore.core.implementation.util.Slf4jLoggerShim.java" checks="MissingJavadocMethodCheck" />
13+
<suppress files="io.clientcore.core.implementation.instrumentation.Slf4jLoggerShim.java" checks="MissingJavadocMethodCheck" />
1414
<suppress files="io.clientcore.core.implementation.http.rest.HeaderSubstitution.java" checks="MissingJavadocTypeCheck" />
1515
<suppress files="io.clientcore.core.implementation.http.rest.RequestDataConfiguration.java" checks="MissingJavadocTypeCheck" />
1616
<suppress files="io.clientcore.core.implementation.http.rest.RestProxyImpl.java" checks="MissingJavadocTypeCheck" />
1717
<suppress files="io.clientcore.core.implementation.util.EnvironmentConfiguration.java" checks="MissingJavadocTypeCheck" />
1818
<suppress files="io.clientcore.core.implementation.util.ImplUtils.java" checks="MissingJavadocTypeCheck" />
19-
<suppress files="io.clientcore.core.implementation.util.Slf4jLoggerShim.java" checks="MissingJavadocTypeCheck" />
19+
<suppress files="io.clientcore.core.implementation.instrumentation.Slf4jLoggerShim.java" checks="MissingJavadocTypeCheck" />
2020
<suppress files="io.clientcore.core.implementation.util.EnvironmentConfiguration.java" checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" />
21-
<suppress files="io.clientcore.core.implementation.util.Slf4jLoggerShim.java" checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" />
22-
<suppress files="io.clientcore.core.implementation.http.rest.SwaggerMethodParser.java" checks="com.azure.tools.checkstyle.checks.GoodLoggingCheck" />
21+
<suppress files="io.clientcore.core.implementation.instrumentation.Slf4jLoggerShim.java" checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" />
2322
<suppress files="io.clientcore.core.implementation.ReflectionSerializable.java" checks="com.azure.tools.checkstyle.checks.JavadocThrowsChecks" />
2423
<suppress files="io.clientcore.core.implementation.http.serializer.HttpResponseBodyDecoder.java" checks="com.azure.tools.checkstyle.checks.JavadocThrowsChecks" />
2524
<suppress files="io.clientcore.core.http.client.DefaultHttpClientBuilder.java" checks="com.azure.tools.checkstyle.checks.ServiceClientBuilderCheck" />

sdk/clientcore/core/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464

6565
--add-exports io.clientcore.core/io.clientcore.core.shared=ALL-UNNAMED
6666
--add-exports io.clientcore.core/io.clientcore.core.implementation=ALL-UNNAMED
67+
--add-exports io.clientcore.core/io.clientcore.core.implementation.instrumentation.fallback=ALL-UNNAMED
6768
</javaModulesSurefireArgLine>
6869

6970
<!-- If JMH benchmarking was ran Checkstyle may fail on jmh_benchmark generated classes, ignore them. -->

sdk/clientcore/core/spotbugs-exclude.xml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@
7171
<Class name="io.clientcore.core.implementation.http.rest.SwaggerMethodParser" />
7272
<Class name="io.clientcore.core.implementation.instrumentation.otel.OTelInstrumentation" />
7373
<Class name="io.clientcore.core.serialization.json.implementation.jackson.core.util.RequestPayload" />
74-
<Class name="io.clientcore.core.util.ClientLogger" />
74+
<Class name="io.clientcore.core.instrumentation.logging.ClientLogger" />
75+
<Class name="io.clientcore.core.implementation.instrumentation.otel.OTelInstrumentation" />
7576
</Or>
7677
</Match>
7778
<Match>
@@ -121,8 +122,8 @@
121122
<Class name="io.clientcore.core.serialization.xml.XmlReader" />
122123
<Class name="io.clientcore.core.shared.HttpClientTests" />
123124
<Class name="io.clientcore.core.shared.HttpClientTestsServer" />
124-
<Class name="io.clientcore.core.util.ClientLoggerTests" />
125-
<Class name="io.clientcore.core.util.HttpLoggingPolicyTests" />
125+
<Class name="io.clientcore.core.instrumentation.logging.ClientLoggerTests" />
126+
<Class name="io.clientcore.core.instrumentation.logging.InstrumentationTestUtils" />
126127
<Class name="io.clientcore.core.util.binarydata.BinaryDataTest" />
127128
<Class name="io.clientcore.core.util.serializer.JsonSerializerTests" />
128129
</Or>
@@ -165,9 +166,9 @@
165166
<Match>
166167
<Bug pattern="INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE" />
167168
<Or>
168-
<Class name="io.clientcore.core.implementation.util.DefaultLogger" />
169+
<Class name="io.clientcore.core.implementation.instrumentation.DefaultLogger" />
169170
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.UncheckedStreamException" />
170-
<Class name="io.clientcore.core.util.ClientLoggerTests" />
171+
<Class name="io.clientcore.core.instrumentation.logging.ClientLoggerTests" />
171172
</Or>
172173
</Match>
173174
<Match>
@@ -237,13 +238,14 @@
237238
<Class name="io.clientcore.core.implementation.http.rest.LengthValidatingInputStreamTests" />
238239
<Class name="io.clientcore.core.serialization.json.implementation.StringBuilderWriterTests" />
239240
<Class name="io.clientcore.core.util.binarydata.BinaryDataTest" />
241+
<Class name="io.clientcore.core.implementation.instrumentation.fallback.FallbackInstrumentationTests" />
240242
</Or>
241243
</Match>
242244
<Match>
243245
<Bug pattern="OS_OPEN_STREAM" />
244246
<Or>
245247
<Class name="io.clientcore.core.serialization.json.implementation.StringBuilderWriterTests" />
246-
<Class name="io.clientcore.core.util.HttpLoggingPolicyTests" />
248+
<Class name="io.clientcore.core.http.pipeline.HttpInstrumentationLoggingTests" />
247249
</Or>
248250
</Match>
249251
<Match>
@@ -259,6 +261,7 @@
259261
<Class name="io.clientcore.core.http.pipeline.HttpRetryPolicy" />
260262
<Class name="io.clientcore.core.shared.HttpClientTests" />
261263
<Class name="io.clientcore.core.shared.HttpClientTestsServer" />
264+
<Class name="io.clientcore.core.implementation.instrumentation.fallback.RandomIdUtils" />
262265
</Or>
263266
</Match>
264267
<Match>
@@ -399,4 +402,16 @@
399402
<Bug pattern="XXE_XMLSTREAMREADER" />
400403
<Class name="io.clientcore.core.serialization.xml.XmlReader" />
401404
</Match>
405+
<Match>
406+
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE" />
407+
<Class name="io.clientcore.core.http.pipeline.HttpInstrumentationPolicy" />
408+
</Match>
409+
<Match>
410+
<Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE" />
411+
<Class name="io.clientcore.core.http.pipeline.HttpInstrumentationPolicy" />
412+
</Match>
413+
<Match>
414+
<Bug pattern="AA_ASSERTION_OF_ARGUMENTS" />
415+
<Class name="io.clientcore.core.implementation.instrumentation.otel.tracing.OTelSpanContext" />
416+
</Match>
402417
</FindBugsFilter>

sdk/clientcore/core/src/main/java/io/clientcore/core/credential/KeyCredential.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
package io.clientcore.core.credential;
55

6-
import io.clientcore.core.util.ClientLogger;
6+
import io.clientcore.core.instrumentation.logging.ClientLogger;
77

88
import java.util.Objects;
99

sdk/clientcore/core/src/main/java/io/clientcore/core/http/client/DefaultHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.clientcore.core.http.models.Response;
1414
import io.clientcore.core.http.models.ResponseBodyMode;
1515
import io.clientcore.core.http.models.ServerSentEventListener;
16-
import io.clientcore.core.util.ClientLogger;
16+
import io.clientcore.core.instrumentation.logging.ClientLogger;
1717
import io.clientcore.core.util.ServerSentEventUtils;
1818
import io.clientcore.core.util.ServerSentResult;
1919
import io.clientcore.core.util.binarydata.BinaryData;

sdk/clientcore/core/src/main/java/io/clientcore/core/http/client/DefaultHttpClientBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import io.clientcore.core.http.client.implementation.JdkHttpClientProxySelector;
77
import io.clientcore.core.http.models.ProxyOptions;
8-
import io.clientcore.core.util.ClientLogger;
8+
import io.clientcore.core.instrumentation.logging.ClientLogger;
99
import io.clientcore.core.util.SharedExecutorService;
1010
import io.clientcore.core.util.configuration.Configuration;
1111

sdk/clientcore/core/src/main/java/io/clientcore/core/http/client/implementation/HeaderFilteringMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package io.clientcore.core.http.client.implementation;
44

55
import io.clientcore.core.http.models.HttpHeaders;
6-
import io.clientcore.core.util.ClientLogger;
6+
import io.clientcore.core.instrumentation.logging.ClientLogger;
77

88
import java.util.AbstractMap;
99
import java.util.List;

sdk/clientcore/core/src/main/java/io/clientcore/core/http/client/implementation/JdkHttpRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package io.clientcore.core.http.client.implementation;
44

55
import io.clientcore.core.http.models.HttpMethod;
6-
import io.clientcore.core.util.ClientLogger;
6+
import io.clientcore.core.instrumentation.logging.ClientLogger;
77

88
import java.net.URI;
99
import java.net.http.HttpClient;

sdk/clientcore/core/src/main/java/io/clientcore/core/http/client/implementation/JdkHttpUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import io.clientcore.core.http.models.HttpHeaderName;
66
import io.clientcore.core.http.models.HttpHeaders;
7-
import io.clientcore.core.util.ClientLogger;
7+
import io.clientcore.core.instrumentation.logging.ClientLogger;
88
import io.clientcore.core.util.SharedExecutorService;
99
import io.clientcore.core.util.configuration.Configuration;
1010

sdk/clientcore/core/src/main/java/io/clientcore/core/http/models/HttpRedirectOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package io.clientcore.core.http.models;
55

66
import io.clientcore.core.http.pipeline.HttpRequestRedirectCondition;
7-
import io.clientcore.core.util.ClientLogger;
7+
import io.clientcore.core.instrumentation.logging.ClientLogger;
88

99
import java.util.EnumSet;
1010
import java.util.function.Predicate;

0 commit comments

Comments
 (0)