Skip to content

Move wrapper class out of S3AsyncClient_Instrumentation #2503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Move wrapper class out of S3AsyncClient_Instrumentation #2503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions ...s3-2.0/src/main/java/com/agent/instrumentation/awsjavasdk2/services/s3/ResultWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.agent.instrumentation.awsjavasdk2.services.s3;

import com.newrelic.agent.bridge.AgentBridge;
import com.newrelic.api.agent.Segment;
import com.newrelic.api.agent.weaver.Weaver;

import java.util.function.BiConsumer;

public class ResultWrapper<T, U> implements BiConsumer<T, U> {
private Segment segment;

public ResultWrapper(Segment segment) {
this.segment = segment;
}

@Override
public void accept(T t, U u) {
try {
segment.end();
} catch (Throwable t1) {
AgentBridge.instrumentation.noticeInstrumentationError(t1, Weaver.getImplementationTitle());
}
}
}
30 changes: 30 additions & 0 deletions .../main/java/com/agent/instrumentation/awsjavasdk2/services/s3/S3ResponseResultWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.agent.instrumentation.awsjavasdk2.services.s3;

import com.newrelic.agent.bridge.AgentBridge;
import com.newrelic.api.agent.Segment;
import com.newrelic.api.agent.weaver.Weaver;
import software.amazon.awssdk.services.s3.model.S3Response;

import java.util.function.BiConsumer;

public class S3ResponseResultWrapper<T extends S3Response, U> implements BiConsumer<T, U> {
private Segment segment;
private String uri;
private String operationName;

public S3ResponseResultWrapper(Segment segment, String uri, String operationName) {
this.segment = segment;
this.uri = uri;
this.operationName = operationName;
}

@Override
public void accept(T s3Response, U u) {
try {
S3MetricUtil.reportExternalMetrics(segment, uri, s3Response, operationName);
segment.end();
} catch (Throwable t1) {
AgentBridge.instrumentation.noticeInstrumentationError(t1, Weaver.getImplementationTitle());
}
}
}
45 changes: 2 additions & 43 deletions ...3-2.0/src/main/java/software/amazon/awssdk/services/s3/S3AsyncClient_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

package software.amazon.awssdk.services.s3;

import com.agent.instrumentation.awsjavasdk2.services.s3.S3MetricUtil;
import com.agent.instrumentation.awsjavasdk2.services.s3.ResultWrapper;
import com.agent.instrumentation.awsjavasdk2.services.s3.S3ResponseResultWrapper;
import com.newrelic.agent.bridge.AgentBridge;
import com.newrelic.api.agent.NewRelic;
import com.newrelic.api.agent.Segment;
import com.newrelic.api.agent.weaver.MatchType;
import com.newrelic.api.agent.weaver.Weave;
import com.newrelic.api.agent.weaver.Weaver;
import java.util.Optional;
import software.amazon.awssdk.core.async.AsyncRequestBody;
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
Expand All @@ -34,10 +34,8 @@
import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
import software.amazon.awssdk.services.s3.model.S3Response;

import java.util.concurrent.CompletableFuture;
import java.util.function.BiConsumer;

@Weave(type = MatchType.Interface, originalName = "software.amazon.awssdk.services.s3.S3AsyncClient")
public class S3AsyncClient_Instrumentation {
Expand Down Expand Up @@ -131,43 +129,4 @@ public CompletableFuture<DeleteObjectsResponse> deleteObjects(DeleteObjectsReque

return result.whenComplete(new S3ResponseResultWrapper<>(segment, uri, "deleteObjects"));
}

private class ResultWrapper<T, U> implements BiConsumer<T, U> {
private Segment segment;

public ResultWrapper(Segment segment) {
this.segment = segment;
}

@Override
public void accept(T t, U u) {
try {
segment.end();
} catch (Throwable t1) {
AgentBridge.instrumentation.noticeInstrumentationError(t1, Weaver.getImplementationTitle());
}
}
}

private class S3ResponseResultWrapper<T extends S3Response, U> implements BiConsumer<T, U> {
private Segment segment;
private String uri;
private String operationName;

public S3ResponseResultWrapper(Segment segment, String uri, String operationName) {
this.segment = segment;
this.uri = uri;
this.operationName = operationName;
}

@Override
public void accept(T s3Response, U u) {
try {
S3MetricUtil.reportExternalMetrics(segment, uri, s3Response, operationName);
segment.end();
} catch (Throwable t1) {
AgentBridge.instrumentation.noticeInstrumentationError(t1, Weaver.getImplementationTitle());
}
}
}
}
Loading