Skip to content

Commit 4282f65

Browse files
ygreeygree
committed
rename Response wrappers to minimize confusion with ResponseService
1 parent 55423a0 commit 4282f65

12 files changed

+44
-43
lines changed

‎dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionModule.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public String[] helperClassNames() {
1717
return new String[] {
1818
packageName + ".ChatCompletionDecorator",
1919
packageName + ".OpenAiDecorator",
20-
packageName + ".ResponseWrappers",
21-
packageName + ".ResponseWrappers$DDHttpResponseFor",
22-
packageName + ".ResponseWrappers$1",
23-
packageName + ".ResponseWrappers$2",
24-
packageName + ".ResponseWrappers$2$1",
20+
packageName + ".HttpResponseWrappers",
21+
packageName + ".HttpResponseWrappers$DDHttpResponseFor",
22+
packageName + ".HttpResponseWrappers$1",
23+
packageName + ".HttpResponseWrappers$2",
24+
packageName + ".HttpResponseWrappers$2$1",
2525
packageName + ".ToolCallExtractor",
2626
packageName + ".ToolCallExtractor$1"
2727
};

‎dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceAsyncInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static void exit(
6969
}
7070
if (future != null) {
7171
future =
72-
ResponseWrappers.wrapFutureResponse(
72+
HttpResponseWrappers.wrapFutureHttpResponse(
7373
future, span, ChatCompletionDecorator.DECORATE::withChatCompletion);
7474
} else {
7575
span.finish();
@@ -103,7 +103,7 @@ public static void exit(
103103
}
104104
if (future != null) {
105105
future =
106-
ResponseWrappers.wrapFutureStreamResponse(
106+
HttpResponseWrappers.wrapFutureHttpResponseStream(
107107
future, span, ChatCompletionDecorator.DECORATE::withChatCompletionChunks);
108108
} else {
109109
span.finish();

‎dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static void exit(
6868
}
6969
if (response != null) {
7070
response =
71-
ResponseWrappers.wrapResponse(
71+
HttpResponseWrappers.wrapHttpResponse(
7272
response, span, ChatCompletionDecorator.DECORATE::withChatCompletion);
7373
}
7474
DECORATE.beforeFinish(span);
@@ -103,7 +103,7 @@ public static void exit(
103103
}
104104
if (response != null) {
105105
response =
106-
ResponseWrappers.wrapStreamResponse(
106+
HttpResponseWrappers.wrapHttpResponseStream(
107107
response, span, ChatCompletionDecorator.DECORATE::withChatCompletionChunks);
108108
} else {
109109
span.finish();

‎dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionModule.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public String[] helperClassNames() {
1717
return new String[] {
1818
packageName + ".CompletionDecorator",
1919
packageName + ".OpenAiDecorator",
20-
packageName + ".ResponseWrappers",
21-
packageName + ".ResponseWrappers$DDHttpResponseFor",
22-
packageName + ".ResponseWrappers$1",
23-
packageName + ".ResponseWrappers$2",
24-
packageName + ".ResponseWrappers$2$1"
20+
packageName + ".HttpResponseWrappers",
21+
packageName + ".HttpResponseWrappers$DDHttpResponseFor",
22+
packageName + ".HttpResponseWrappers$1",
23+
packageName + ".HttpResponseWrappers$2",
24+
packageName + ".HttpResponseWrappers$2$1"
2525
};
2626
}
2727

‎dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceAsyncInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static void exit(
6464
}
6565
if (future != null) {
6666
future =
67-
ResponseWrappers.wrapFutureResponse(
67+
HttpResponseWrappers.wrapFutureHttpResponse(
6868
future, span, CompletionDecorator.DECORATE::withCompletion);
6969
} else {
7070
span.finish();
@@ -99,7 +99,7 @@ public static void exit(
9999
}
100100
if (future != null) {
101101
future =
102-
ResponseWrappers.wrapFutureStreamResponse(
102+
HttpResponseWrappers.wrapFutureHttpResponseStream(
103103
future, span, CompletionDecorator.DECORATE::withCompletions);
104104
} else {
105105
span.finish();

‎dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static void exit(
7474
}
7575
if (response != null) {
7676
response =
77-
ResponseWrappers.wrapResponse(
77+
HttpResponseWrappers.wrapHttpResponse(
7878
response, span, CompletionDecorator.DECORATE::withCompletion);
7979
}
8080
DECORATE.beforeFinish(span);
@@ -109,7 +109,7 @@ public static void exit(
109109
}
110110
if (response != null) {
111111
response =
112-
ResponseWrappers.wrapStreamResponse(
112+
HttpResponseWrappers.wrapHttpResponseStream(
113113
response, span, CompletionDecorator.DECORATE::withCompletions);
114114
} else {
115115
span.finish();

‎dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingModule.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public String[] helperClassNames() {
1717
return new String[] {
1818
packageName + ".EmbeddingDecorator",
1919
packageName + ".OpenAiDecorator",
20-
packageName + ".ResponseWrappers",
21-
packageName + ".ResponseWrappers$DDHttpResponseFor",
22-
packageName + ".ResponseWrappers$1",
23-
packageName + ".ResponseWrappers$2",
24-
packageName + ".ResponseWrappers$2$1"
20+
packageName + ".HttpResponseWrappers",
21+
packageName + ".HttpResponseWrappers$DDHttpResponseFor",
22+
packageName + ".HttpResponseWrappers$1",
23+
packageName + ".HttpResponseWrappers$2",
24+
packageName + ".HttpResponseWrappers$2$1"
2525
};
2626
}
2727

‎dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingServiceInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static void exit(
5555
}
5656
if (response != null) {
5757
response =
58-
ResponseWrappers.wrapResponse(
58+
HttpResponseWrappers.wrapHttpResponse(
5959
response, span, EmbeddingDecorator.DECORATE::withCreateEmbeddingResponse);
6060
}
6161
DECORATE.beforeFinish(span);

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseWrappers.java renamed to dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/HttpResponseWrappers.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.stream.Stream;
1515
import org.jetbrains.annotations.NotNull;
1616

17-
public class ResponseWrappers {
17+
public class HttpResponseWrappers {
1818

1919
abstract static class DDHttpResponseFor<T> implements HttpResponseFor<T> {
2020
private final HttpResponseFor<T> delegate;
@@ -53,7 +53,7 @@ public void close() {
5353
}
5454
}
5555

56-
public static <T> HttpResponseFor<T> wrapResponse(
56+
public static <T> HttpResponseFor<T> wrapHttpResponse(
5757
HttpResponseFor<T> response, AgentSpan span, BiConsumer<AgentSpan, T> afterParse) {
5858
DECORATE.withHttpResponse(span, response);
5959
return new DDHttpResponseFor<T>(response) {
@@ -65,20 +65,20 @@ public T afterParse(T t) {
6565
};
6666
}
6767

68-
public static <T> CompletableFuture<HttpResponseFor<T>> wrapFutureResponse(
68+
public static <T> CompletableFuture<HttpResponseFor<T>> wrapFutureHttpResponse(
6969
CompletableFuture<HttpResponseFor<T>> future,
7070
AgentSpan span,
7171
BiConsumer<AgentSpan, T> afterParse) {
7272
return future
73-
.thenApply(response -> wrapResponse(response, span, afterParse))
73+
.thenApply(response -> wrapHttpResponse(response, span, afterParse))
7474
.whenComplete(
7575
(r, t) -> {
7676
DECORATE.beforeFinish(span);
7777
span.finish();
7878
});
7979
}
8080

81-
public static <T> HttpResponseFor<StreamResponse<T>> wrapStreamResponse(
81+
public static <T> HttpResponseFor<StreamResponse<T>> wrapHttpResponseStream(
8282
HttpResponseFor<StreamResponse<T>> response,
8383
final AgentSpan span,
8484
BiConsumer<AgentSpan, List<T>> decorate) {
@@ -110,10 +110,11 @@ public void close() {
110110
};
111111
}
112112

113-
public static <T> CompletableFuture<HttpResponseFor<StreamResponse<T>>> wrapFutureStreamResponse(
114-
CompletableFuture<HttpResponseFor<StreamResponse<T>>> future,
115-
AgentSpan span,
116-
BiConsumer<AgentSpan, List<T>> decorate) {
117-
return future.thenApply(r -> wrapStreamResponse(r, span, decorate));
113+
public static <T>
114+
CompletableFuture<HttpResponseFor<StreamResponse<T>>> wrapFutureHttpResponseStream(
115+
CompletableFuture<HttpResponseFor<StreamResponse<T>>> future,
116+
AgentSpan span,
117+
BiConsumer<AgentSpan, List<T>> decorate) {
118+
return future.thenApply(r -> wrapHttpResponseStream(r, span, decorate));
118119
}
119120
}

‎dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseModule.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public String[] helperClassNames() {
1717
return new String[] {
1818
packageName + ".ResponseDecorator",
1919
packageName + ".OpenAiDecorator",
20-
packageName + ".ResponseWrappers",
21-
packageName + ".ResponseWrappers$DDHttpResponseFor",
22-
packageName + ".ResponseWrappers$1",
23-
packageName + ".ResponseWrappers$2",
24-
packageName + ".ResponseWrappers$2$1",
20+
packageName + ".HttpResponseWrappers",
21+
packageName + ".HttpResponseWrappers$DDHttpResponseFor",
22+
packageName + ".HttpResponseWrappers$1",
23+
packageName + ".HttpResponseWrappers$2",
24+
packageName + ".HttpResponseWrappers$2$1",
2525
packageName + ".ToolCallExtractor",
2626
packageName + ".ToolCallExtractor$1"
2727
};

0 commit comments

Comments
 (0)