Skip to content

Commit f2e4560

Browse files
committed
spotless
1 parent 56ffab8 commit f2e4560

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerTracer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ public void onPush() {
147147
// When GraphInterpreterInstrumentation sets `tracingRequest.context` as the current
148148
// context, the akka Envelope + Actor instrumentation propagates it all the way
149149
// back to here and follows the HttpResponse up the stack of stages.
150-
// If http-pipelining is enabled, it will also propagate this context to the handling
151-
// of the next request, leading to context-leaking errors.
150+
// If http-pipelining is enabled, it will also propagate this context to the
151+
// handling of the next request, leading to context-leaking errors.
152152
// To prevent this, we reset the context to what it was before creating it.
153153
tracingRequest.parentContext.makeCurrent();
154154

@@ -175,7 +175,6 @@ public void onUpstreamFailure(Throwable exception) {
175175
fail(responseOut, exception);
176176
}
177177

178-
179178
@Override
180179
public void onUpstreamFinish() {
181180
// End any ongoing spans, though there should be none.

instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoTracingRequest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
import org.apache.pekko.http.scaladsl.model.HttpRequest;
1515

1616
public class PekkoTracingRequest implements ImplicitContextKeyed {
17-
private static final ContextKey<PekkoTracingRequest> CONTEXT_KEY = named("opentelemetry-pekko-tracing-request");
17+
private static final ContextKey<PekkoTracingRequest> CONTEXT_KEY =
18+
named("opentelemetry-pekko-tracing-request");
1819
static final AttributeKey<PekkoTracingRequest> ATTR_KEY =
1920
new AttributeKey<>("_otel_ctx", PekkoTracingRequest.class);
2021
static final PekkoTracingRequest EMPTY = new PekkoTracingRequest(null, null, null);

instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestAsyncWebServer.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ object PekkoHttpTestAsyncWebServer {
6464
if (null == binding) {
6565
import scala.concurrent.duration._
6666
binding = Await.result(
67-
Http().bindAndHandleAsync(asyncHandler, "localhost", port, parallelism = 2),
67+
Http()
68+
.bindAndHandleAsync(asyncHandler, "localhost", port, parallelism = 2),
6869
10.seconds
6970
)
7071
}

0 commit comments

Comments
 (0)