Skip to content

Commit 4dd2ae1

Browse files
otelbot[bot]trask
andauthored
Review fixes for kubernetes-client-7.0:javaagent (open-telemetry#18173)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent 4a1283e commit 4dd2ae1

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/ApiClientInstrumentation.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.javaagent.instrumentation.kubernetesclient.v7_0;
77

88
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
9-
import static io.opentelemetry.javaagent.instrumentation.kubernetesclient.v7_0.KubernetesClientSingletons.inject;
109
import static io.opentelemetry.javaagent.instrumentation.kubernetesclient.v7_0.KubernetesClientSingletons.instrumenter;
1110
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1211
import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -69,7 +68,7 @@ public static Request onExit(@Advice.Return Request originalReturnValue) {
6968
Context context = instrumenter().start(parentContext, originalReturnValue);
7069
Scope scope = context.makeCurrent();
7170
Request.Builder requestWithPropagation = originalReturnValue.newBuilder();
72-
inject(context, requestWithPropagation);
71+
KubernetesClientSingletons.inject(context, requestWithPropagation);
7372
Request request = requestWithPropagation.build();
7473
CurrentState.set(parentContext, context, scope, request);
7574
return request;

instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/v7_0/KubernetesRequestDigest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static KubernetesRequestDigest parse(Request request) {
4444
resourceMeta,
4545
KubernetesVerb.of(
4646
request.method(), hasNamePathParameter(resourceMeta), hasWatchParameter(request)));
47-
} catch (ParseKubernetesResourceException e) {
47+
} catch (IllegalArgumentException | ParseKubernetesResourceException e) {
4848
return nonResource(urlPath);
4949
}
5050
}

0 commit comments

Comments
 (0)