Skip to content

Commit ceed0fe

Browse files
committed
fix argument order
1 parent b5298eb commit ceed0fe

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpclient/HttpClientInstrumentation.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,38 +121,38 @@ public static void methodExit(
121121
public static class SendAsyncAdvice {
122122

123123
public static class AsyncAdviceScope {
124-
private final Context context;
125124
private final Context parentContext;
125+
private final Context context;
126126
private final Scope scope;
127-
private final HttpRequest request;
128127
private final CallDepth callDepth;
128+
private final HttpRequest request;
129129

130130
public AsyncAdviceScope(
131-
Context context,
132131
Context parentContext,
132+
Context context,
133133
Scope scope,
134-
HttpRequest request,
135-
CallDepth callDepth) {
136-
this.context = context;
134+
CallDepth callDepth,
135+
HttpRequest request) {
137136
this.parentContext = parentContext;
137+
this.context = context;
138138
this.scope = scope;
139-
this.request = request;
140139
this.callDepth = callDepth;
140+
this.request = request;
141141
}
142142

143143
@Nullable
144144
public static AsyncAdviceScope start(HttpRequest request) {
145145
CallDepth callDepth = CallDepth.forClass(HttpClient.class);
146146
if (callDepth.getAndIncrement() > 0) {
147-
return new AsyncAdviceScope(null, null, null, request, callDepth);
147+
return new AsyncAdviceScope(null, null, null, callDepth, request);
148148
}
149149
Context parentContext = currentContext();
150150
if (!instrumenter().shouldStart(parentContext, request)) {
151151
return null;
152152
}
153153
Context context = instrumenter().start(parentContext, request);
154154
return new AsyncAdviceScope(
155-
parentContext, context, context.makeCurrent(), request, callDepth);
155+
parentContext, context, context.makeCurrent(), callDepth, request);
156156
}
157157

158158
public CompletableFuture<HttpResponse<?>> end(@Nullable Throwable throwable,
@@ -186,7 +186,6 @@ public static CompletableFuture<HttpResponse<?>> methodExit(
186186
@Advice.Return @Nullable CompletableFuture<HttpResponse<?>> future,
187187
@Advice.Thrown @Nullable Throwable throwable,
188188
@Advice.Enter @Nullable AsyncAdviceScope scope) {
189-
190189
return scope == null ? future : scope.end(throwable, future);
191190
}
192191
}

0 commit comments

Comments
 (0)