From 3464c9ba2db89e85c6a87e7d28c066c62accf780 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Mon, 13 Jan 2025 15:31:41 -0800 Subject: [PATCH] fedback and cleanup --- .../fallback/FallbackContextPropagator.java | 6 +++--- sdk/clientcore/http-stress/pom.xml | 2 +- .../src/main/java/io/clientcore/http/stress/HttpGet.java | 9 ++++----- .../main/java/io/clientcore/http/stress/HttpPatch.java | 8 ++++---- .../io/clientcore/http/stress/util/TelemetryHelper.java | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/sdk/clientcore/core/src/main/java/io/clientcore/core/implementation/instrumentation/fallback/FallbackContextPropagator.java b/sdk/clientcore/core/src/main/java/io/clientcore/core/implementation/instrumentation/fallback/FallbackContextPropagator.java index c61837b0138a..7af20884e802 100644 --- a/sdk/clientcore/core/src/main/java/io/clientcore/core/implementation/instrumentation/fallback/FallbackContextPropagator.java +++ b/sdk/clientcore/core/src/main/java/io/clientcore/core/implementation/instrumentation/fallback/FallbackContextPropagator.java @@ -76,7 +76,7 @@ private static boolean isValidTraceparent(String traceparent) { boolean isAllZero = true; for (int i = 3; i < 35; i++) { char c = traceparent.charAt(i); - if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f'))) { + if (c < '0' || c > 'f' || (c > '9' && c < 'a')) { return false; } if (c != '0') { @@ -91,7 +91,7 @@ private static boolean isValidTraceparent(String traceparent) { isAllZero = true; for (int i = 36; i < 52; i++) { char c = traceparent.charAt(i); - if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f'))) { + if (c < '0' || c > 'f' || (c > '9' && c < 'a')) { return false; } if (c != '0') { @@ -106,7 +106,7 @@ private static boolean isValidTraceparent(String traceparent) { // trace-flags - 2 lower case hex characters for (int i = 53; i < 55; i++) { char c = traceparent.charAt(i); - if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f'))) { + if (c < '0' || c > 'f' || (c > '9' && c < 'a')) { return false; } } diff --git a/sdk/clientcore/http-stress/pom.xml b/sdk/clientcore/http-stress/pom.xml index ea803e4af436..92c0ba46e3f5 100644 --- a/sdk/clientcore/http-stress/pom.xml +++ b/sdk/clientcore/http-stress/pom.xml @@ -32,7 +32,7 @@ io.clientcore core - 1.0.0-beta.1 + 1.0.0-beta.2 io.clientcore diff --git a/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/HttpGet.java b/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/HttpGet.java index b2e34e29c182..9ed784836eb7 100644 --- a/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/HttpGet.java +++ b/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/HttpGet.java @@ -10,18 +10,17 @@ import io.clientcore.core.http.models.HttpMethod; import io.clientcore.core.http.models.HttpRequest; import io.clientcore.core.http.models.Response; -import io.clientcore.core.http.pipeline.HttpLoggingPolicy; +import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy; import io.clientcore.core.http.pipeline.HttpPipeline; import io.clientcore.core.http.pipeline.HttpPipelineBuilder; import io.clientcore.core.http.pipeline.HttpRetryPolicy; -import io.clientcore.core.util.ClientLogger; +import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.http.okhttp3.OkHttpHttpClientProvider; import io.clientcore.http.stress.util.TelemetryHelper; import reactor.core.publisher.Mono; import java.io.IOException; import java.io.UncheckedIOException; -import java.lang.instrument.Instrumentation; import java.net.URI; import java.net.URISyntaxException; import java.time.Instant; @@ -152,8 +151,8 @@ private HttpRequest createRequest() { private HttpPipelineBuilder getPipelineBuilder() { HttpLogOptions logOptions = new HttpLogOptions().setLogLevel(HttpLogOptions.HttpLogDetailLevel.HEADERS); - HttpPipelineBuilder builder - = new HttpPipelineBuilder().policies(new HttpRetryPolicy(), new InstrumentationPolicy(null, logOptions)); + HttpPipelineBuilder builder = new HttpPipelineBuilder().policies(new HttpRetryPolicy(), + new HttpInstrumentationPolicy(null, logOptions)); if (options.getHttpClient() == PerfStressOptions.HttpClientType.OKHTTP) { builder.httpClient(new OkHttpHttpClientProvider().getSharedInstance()); diff --git a/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/HttpPatch.java b/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/HttpPatch.java index 95ebc444fbe1..192003ae4499 100644 --- a/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/HttpPatch.java +++ b/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/HttpPatch.java @@ -10,11 +10,11 @@ import io.clientcore.core.http.models.HttpMethod; import io.clientcore.core.http.models.HttpRequest; import io.clientcore.core.http.models.Response; -import io.clientcore.core.http.pipeline.HttpLoggingPolicy; +import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy; import io.clientcore.core.http.pipeline.HttpPipeline; import io.clientcore.core.http.pipeline.HttpPipelineBuilder; import io.clientcore.core.http.pipeline.HttpRetryPolicy; -import io.clientcore.core.util.ClientLogger; +import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.util.binarydata.BinaryData; import io.clientcore.http.okhttp3.OkHttpHttpClientProvider; import io.clientcore.http.stress.util.TelemetryHelper; @@ -89,8 +89,8 @@ private HttpRequest createRequest() { private HttpPipelineBuilder getPipelineBuilder() { HttpLogOptions logOptions = new HttpLogOptions().setLogLevel(HttpLogOptions.HttpLogDetailLevel.HEADERS); - HttpPipelineBuilder builder - = new HttpPipelineBuilder().policies(new HttpRetryPolicy(), new InstrumentationPolicy(null, logOptions)); + HttpPipelineBuilder builder = new HttpPipelineBuilder().policies(new HttpRetryPolicy(), + new HttpInstrumentationPolicy(null, logOptions)); if (options.getHttpClient() == PerfStressOptions.HttpClientType.OKHTTP) { builder.httpClient(new OkHttpHttpClientProvider().getSharedInstance()); diff --git a/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/util/TelemetryHelper.java b/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/util/TelemetryHelper.java index 0aeaf6197400..871fecf765aa 100644 --- a/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/util/TelemetryHelper.java +++ b/sdk/clientcore/http-stress/src/main/java/io/clientcore/http/stress/util/TelemetryHelper.java @@ -5,7 +5,7 @@ import com.azure.monitor.opentelemetry.exporter.AzureMonitorExporter; import com.azure.monitor.opentelemetry.exporter.AzureMonitorExporterOptions; -import io.clientcore.core.util.ClientLogger; +import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.http.stress.StressOptions; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry;