Skip to content

Commit 3755984

Browse files
committed
[o11y] Clean up lint in STW tests, obsolete compat flag
1 parent aa74399 commit 3755984

File tree

8 files changed

+5
-13
lines changed

8 files changed

+5
-13
lines changed

src/workerd/api/actor-kv-test-tail.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ let invocationPromises = [];
44
let spans = new Map();
55

66
export default {
7-
async fetch(ctrl, env, ctx) {
8-
return new Response('');
9-
},
107
async test(ctrl, env, ctx) {
118
const expected = [
129
{
@@ -47,7 +44,6 @@ export default {
4744
return (event) => {
4845
switch (event.event.type) {
4946
case 'spanOpen':
50-
console.log('span open', event.event.name);
5147
if (event.event.name === 'durable_object_subrequest') {
5248
let span = spans.get(event.event.spanId);
5349
span['subrequests'] = span['subrequests']
@@ -60,7 +56,6 @@ export default {
6056
}
6157
break;
6258
case 'attributes': {
63-
console.log('attributes', event);
6459
let span = spans.get(event.event.spanId);
6560
for (let { name, value } of event.event.info) {
6661
span[name] = value;

src/workerd/api/actor-kv-test.wd-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const config :Workerd.Config = (
1010

1111
const mainWorker :Workerd.Worker = (
1212
compatibilityDate = "2022-09-16",
13-
compatibilityFlags = ["experimental", "nodejs_compat", "streaming_tail_worker", "tail_worker_user_spans"],
13+
compatibilityFlags = ["experimental", "nodejs_compat", "streaming_tail_worker"],
1414

1515
streamingTails = ["tail"],
1616

src/workerd/api/kv-test.wd-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const unitTests :Workerd.Config = (
1010
bindings = [ ( name = "KV", kvNamespace = "kv-test" ), ],
1111
compatibilityDate = "2023-07-24",
1212
# "experimental" flag is needed to test deleteBulk
13-
compatibilityFlags = ["experimental", "nodejs_compat", "service_binding_extra_handlers", "streaming_tail_worker", "tail_worker_user_spans"],
13+
compatibilityFlags = ["experimental", "nodejs_compat", "service_binding_extra_handlers", "streaming_tail_worker"],
1414
streamingTails = ["tail"],
1515
)
1616
),

src/workerd/api/r2-test.wd-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const unitTests :Workerd.Config = (
1212
( name = "SERVICE", service = "r2-test" ),
1313
],
1414
compatibilityDate = "2023-07-24",
15-
compatibilityFlags = ["nodejs_compat", "service_binding_extra_handlers", "streaming_tail_worker", "tail_worker_user_spans"],
15+
compatibilityFlags = ["nodejs_compat", "service_binding_extra_handlers", "streaming_tail_worker"],
1616
streamingTails = ["tail"],
1717
)
1818
),

src/workerd/api/sql-test.wd-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const mainWorker :Workerd.Worker = (
1414
compatibilityDate = "2024-03-04",
1515

1616
# "experimental" flag is needed to test `sql.ingest()` and `sql.prepare()`.
17-
compatibilityFlags = ["experimental", "nodejs_compat", "streaming_tail_worker", "tail_worker_user_spans"],
17+
compatibilityFlags = ["experimental", "nodejs_compat", "streaming_tail_worker"],
1818

1919
modules = [
2020
(name = "worker", esModule = embed "sql-test.js"),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const unitTests :Workerd.Config = (
1313
( name = "CACHE_ENABLED", json = "false" ),
1414
],
1515
compatibilityDate = "2023-08-01",
16-
compatibilityFlags = ["nodejs_compat", "service_binding_extra_handlers", "cache_option_disabled", "streaming_tail_worker", "tail_worker_user_spans"],
16+
compatibilityFlags = ["nodejs_compat", "service_binding_extra_handlers", "cache_option_disabled", "streaming_tail_worker"],
1717
streamingTails = ["log", "log-invalid"],
1818
),
1919
),

src/workerd/io/compatibility-date.capnp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,6 @@ struct CompatibilityFlags @0x8f8c1b68151b6cef {
634634
# correctly. The fix, however, can break existing implementations that don't account
635635
# for the bug so we need to put the fix behind a compat flag.
636636

637-
# Experimental support for exporting user spans to tail worker.
638637
obsolete69 @69 :Bool
639638
$compatEnableFlag("tail_worker_user_spans")
640639
$experimental;

src/workerd/io/trace.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,6 @@ struct Exception final {
554554

555555
// EventInfo types are used to describe the onset of an invocation. The FetchEventInfo
556556
// can also be used to describe the start of a fetch subrequest.
557-
// TODO(o11y): Write KJ_STRINGIFY() for EventInfo to beef up logging for events reported after
558-
// stream close.
559557
using EventInfo = kj::OneOf<FetchEventInfo,
560558
JsRpcEventInfo,
561559
ScheduledEventInfo,

0 commit comments

Comments
 (0)