Skip to content

[nfc] Clean up r2GetClient(), removing getHttpClientWithSpans() #5557

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

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

[nfc] Clean up r2GetClient(), removing getHttpClientWithSpans() #5557

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
15 changes: 9 additions & 6 deletions src/workerd/api/r2-bucket.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,20 @@
namespace workerd::api::public_beta {
kj::Own<kj::HttpClient> r2GetClient(
IoContext& context, uint subrequestChannel, R2UserTracing user) {
kj::Vector<Span::Tag> tags;
tags.add("rpc.service"_kjc, kj::ConstString("r2"_kjc));
tags.add(user.method.key, kj::ConstString(kj::str(user.method.value)));
auto traceSpan = context.makeTraceSpan(user.op);
auto userSpan = context.makeUserTraceSpan(user.op);
TraceContext traceContext(kj::mv(traceSpan), kj::mv(userSpan));
traceContext.userSpan.setTag("rpc.service"_kjc, "r2"_kjc);
traceContext.userSpan.setTag(user.method.key, user.method.value);
KJ_IF_SOME(b, user.bucket) {
tags.add("cloudflare.r2.bucket"_kjc, kj::ConstString(kj::str(b)));
traceContext.userSpan.setTag("cloudflare.r2.bucket"_kjc, b);
}
KJ_IF_SOME(tag, user.extraTag) {
tags.add(tag.key, kj::ConstString(kj::str(tag.value)));
traceContext.userSpan.setTag(tag.key, tag.value);
}

return context.getHttpClientWithSpans(subrequestChannel, true, kj::none, user.op, kj::mv(tags));
return context.getHttpClient(subrequestChannel, true, kj::none, traceContext)
.attach(kj::mv(traceContext));
}

static bool isWholeNumber(double x) {
Expand Down
29 changes: 0 additions & 29 deletions src/workerd/io/io-context.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,26 +960,6 @@ kj::Own<WorkerInterface> IoContext::getSubrequestChannel(
});
}

kj::Own<WorkerInterface> IoContext::getSubrequestChannelWithSpans(uint channel,
bool isInHouse,
kj::Maybe<kj::String> cfBlobJson,
kj::ConstString operationName,
kj::Vector<Span::Tag> tags) {
return getSubrequest(
[&](TraceContext& tracing, IoChannelFactory& channelFactory) {
for (Span::Tag& tag: tags) {
tracing.userSpan.setTag(kj::mv(tag.key), kj::mv(tag.value));
}
return getSubrequestChannelImpl(
channel, isInHouse, kj::mv(cfBlobJson), tracing, channelFactory);
},
SubrequestOptions{
.inHouse = isInHouse,
.wrapMetrics = !isInHouse,
.operationName = kj::mv(operationName),
});
}

kj::Own<WorkerInterface> IoContext::getSubrequestChannelNoChecks(uint channel,
bool isInHouse,
kj::Maybe<kj::String> cfBlobJson,
Expand Down Expand Up @@ -1018,15 +998,6 @@ kj::Own<kj::HttpClient> IoContext::getHttpClient(
getSubrequestChannel(channel, isInHouse, kj::mv(cfBlobJson), kj::mv(operationName)));
}

kj::Own<kj::HttpClient> IoContext::getHttpClientWithSpans(uint channel,
bool isInHouse,
kj::Maybe<kj::String> cfBlobJson,
kj::ConstString operationName,
kj::Vector<Span::Tag> tags) {
return asHttpClient(getSubrequestChannelWithSpans(
channel, isInHouse, kj::mv(cfBlobJson), kj::mv(operationName), kj::mv(tags)));
}

kj::Own<kj::HttpClient> IoContext::getHttpClient(
uint channel, bool isInHouse, kj::Maybe<kj::String> cfBlobJson, TraceContext& traceContext) {
return asHttpClient(getSubrequestChannel(channel, isInHouse, kj::mv(cfBlobJson), traceContext));
Expand Down
13 changes: 0 additions & 13 deletions src/workerd/io/io-context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,12 +854,6 @@ class IoContext final: public kj::Refcounted, private kj::TaskSet::ErrorHandler
kj::Own<WorkerInterface> getSubrequestChannel(
uint channel, bool isInHouse, kj::Maybe<kj::String> cfBlobJson, TraceContext& traceContext);

kj::Own<WorkerInterface> getSubrequestChannelWithSpans(uint channel,
bool isInHouse,
kj::Maybe<kj::String> cfBlobJson,
kj::ConstString operationName,
kj::Vector<Span::Tag> tags);

// Like getSubrequestChannel() but doesn't enforce limits. Use for trusted paths only.
kj::Own<WorkerInterface> getSubrequestChannelNoChecks(uint channel,
bool isInHouse,
Expand All @@ -876,13 +870,6 @@ class IoContext final: public kj::Refcounted, private kj::TaskSet::ErrorHandler
kj::Own<kj::HttpClient> getHttpClient(
uint channel, bool isInHouse, kj::Maybe<kj::String> cfBlobJson, TraceContext& traceContext);

// As above, but with list of span tags to add, analogous to getSubrequestChannelWithSpans().
kj::Own<kj::HttpClient> getHttpClientWithSpans(uint channel,
bool isInHouse,
kj::Maybe<kj::String> cfBlobJson,
kj::ConstString operationName,
kj::Vector<Span::Tag> tags);

// Convenience methods that call getSubrequest*() and adapt the returned WorkerInterface objects
// to HttpClient.
kj::Own<kj::HttpClient> getHttpClientNoChecks(uint channel,
Expand Down