Skip to content

Commit b63bdc5

Browse files
authored
Merge pull request #5528 from cloudflare/dlapid/typos
Fix a few typos.
2 parents 59e8c5e + b4a1dd4 commit b63bdc5

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

src/workerd/api/tail-worker-test.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/workerd/api/tail-worker-test.wd-test

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ const unitTests :Workerd.Config = (
3535
(name = "hiber", worker = .hiberWorker),
3636
(name = "js-rpc-test", worker = .jsRpcWorker),
3737
(name = "TEST_TMPDIR", disk = (writable = true)),
38-
# Dummy legacy tail worker (gets traces from alarms worker and produces trace for main tracer)
39-
(name = "legacy", worker = .logLegacy, ),
38+
# Dummy buffered tail worker (gets traces from alarms worker and produces trace for main tracer)
39+
(name = "buffered", worker = .logBuffered, ),
4040
# Receives trace events from STW, used to check that STW produces trace events properly
4141
(name = "receiver", worker = .logReceiver, ),
4242
# Unified tail worker with tests
@@ -72,8 +72,8 @@ const alarmsWorker :Workerd.Worker = (
7272
bindings = [
7373
(name = "ns", durableObjectNamespace = "DurableObjectExample"),
7474
],
75-
# tailed by the main tail worker and the dummy legacy tail worker, to get traces for it too.
76-
tails = ["legacy"],
75+
# tailed by the main tail worker and the dummy buffered tail worker, to get traces for it too.
76+
tails = ["buffered"],
7777
streamingTails = ["log"],
7878
);
7979

@@ -133,7 +133,7 @@ const logReceiver :Workerd.Worker = (
133133
compatibilityFlags = ["experimental", "nodejs_compat"],
134134
);
135135

136-
const logLegacy :Workerd.Worker = (
136+
const logBuffered :Workerd.Worker = (
137137
modules = [
138138
(name = "worker", esModule = embed "tail-worker-test-dummy.js")
139139
],

src/workerd/io/trace.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ kj::String KJ_STRINGIFY(const TraceId& id);
302302
kj::String KJ_STRINGIFY(const InvocationSpanContext& context);
303303
kj::String KJ_STRINGIFY(const SpanContext& context);
304304

305-
// The various structs defined below are used in both legacy tail workers
305+
// The various structs defined below are used in both buffered tail workers
306306
// and streaming tail workers to report tail events.
307307

308308
// Describes a fetch request
@@ -422,7 +422,7 @@ struct EmailEventInfo final {
422422
EmailEventInfo clone() const;
423423
};
424424

425-
// Describes a legacy tail worker request
425+
// Describes a buffered tail worker request
426426
struct TraceEventInfo final {
427427
struct TraceItem;
428428

src/workerd/io/tracer.c++

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void WorkerTracer::addLog(const tracing::InvocationSpanContext& context,
169169

170170
// TODO(streaming-tail): Here we add the log to the trace object and the tail stream writer, if
171171
// available. If the given worker stage is only tailed by a streaming tail worker, adding the log
172-
// to the legacy trace object is not needed; this will be addressed in a future refactor.
172+
// to the buffered trace object is not needed; this will be addressed in a future refactor.
173173
KJ_IF_SOME(writer, maybeTailStreamWriter) {
174174
// If message is too big on its own, truncate it.
175175
writer->report(context,
@@ -200,7 +200,7 @@ void WorkerTracer::addSpan(tracing::CompleteSpan&& span) {
200200
return;
201201
}
202202

203-
// Note: spans are not available in the legacy tail worker, so we don't need an exceededSpanLimit
203+
// Note: spans are not available in the buffered tail worker, so we don't need an exceededSpanLimit
204204
// variable for it and it can't cause truncation.
205205
auto& tailStreamWriter = KJ_UNWRAP_OR_RETURN(maybeTailStreamWriter);
206206

@@ -526,7 +526,7 @@ void WorkerTracer::setReturn(
526526
timestamp.orDefault([&]() { return getTime(); }));
527527
}
528528

529-
// Add fetch response info for legacy tail worker
529+
// Add fetch response info for buffered tail worker
530530
KJ_IF_SOME(info, fetchResponseInfo) {
531531
KJ_REQUIRE(KJ_REQUIRE_NONNULL(trace->eventInfo).is<tracing::FetchEventInfo>());
532532
KJ_ASSERT(trace->fetchResponseInfo == kj::none, "setFetchResponseInfo can only be called once");

src/workerd/io/tracer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class BaseTracer: public kj::Refcounted {
122122

123123
// Sets the return event for Streaming Tail Worker, including fetchResponseInfo (HTTP status code)
124124
// if available. Must not be called more than once, and fetchResponseInfo should only be set for
125-
// fetch events. For legacy tail worker, there is no distinct return event so we only add
125+
// fetch events. For buffered tail worker, there is no distinct return event so we only add
126126
// fetchResponseInfo to the trace if present.
127127
virtual void setReturn(kj::Maybe<kj::Date> time = kj::none,
128128
kj::Maybe<tracing::FetchResponseInfo> fetchResponseInfo = kj::none) = 0;

src/workerd/server/server.c++

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,7 +2165,7 @@ class Server::WorkerService final: public Service,
21652165
kj::Maybe<kj::Own<WorkerTracer>> workerTracer = kj::none;
21662166

21672167
if (legacyTailWorkers.size() > 0 || streamingTailWorkers.size() > 0) {
2168-
// Setting up legacy tail workers support, but only if we actually have tail workers
2168+
// Setting up buffered tail workers support, but only if we actually have tail workers
21692169
// configured.
21702170
auto tracer = kj::rc<PipelineTracer>();
21712171
auto executionModel =
@@ -2182,7 +2182,7 @@ class Server::WorkerService final: public Service,
21822182
kj::mv(tailStreamWriter));
21832183

21842184
// When the tracer is complete, deliver the traces to both the parent
2185-
// and the legacy tail workers. We do NOT want to attach the tracer to the
2185+
// and the buffered tail workers. We do NOT want to attach the tracer to the
21862186
// tracer->onComplete() promise here because it is the destructor of
21872187
// the PipelineTracer that resolves the onComplete promise. If we attach
21882188
// the tracer to the promise the tracer won't be destroyed while the

0 commit comments

Comments
 (0)