diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..08891d8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..68e481a
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,25 @@
+name: Main
+
+on:
+  push:
+    branches: [main]
+  schedule:
+    - cron: "0 8,20 * * *"
+
+jobs:
+  unit-tests:
+    name: Unit tests
+    uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
+    with:
+      linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+      linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+      linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+
+  benchmarks:
+    name: Benchmarks
+    # Workaround https://github.com/nektos/act/issues/1875
+    uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
+    with:
+      benchmark_package_path: "Benchmarks"
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
new file mode 100644
index 0000000..72a9228
--- /dev/null
+++ b/.github/workflows/pull_request.yml
@@ -0,0 +1,34 @@
+name: PR
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  soundness:
+    name: Soundness
+    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
+    with:
+      license_header_check_project_name: "Swift Distributed Tracing"
+
+  # FIXME: We cannot use -warnings-as-errors because we inherit from a deprecated type in the Tracer type,
+  #        and we need to keep supporting the old type still. This was introduced as we dropped Swift 5.6 and added 5.9/5.10.
+  unit-tests:
+    name: Unit tests
+    uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
+    with:
+      linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+      linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+      linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+
+  benchmarks:
+    name: Benchmarks
+    uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
+    with:
+      benchmark_package_path: "Benchmarks"
+
+  cxx-interop:
+    name: Cxx interop
+    uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
diff --git a/.github/workflows/pull_request_label.yml b/.github/workflows/pull_request_label.yml
new file mode 100644
index 0000000..86f199f
--- /dev/null
+++ b/.github/workflows/pull_request_label.yml
@@ -0,0 +1,18 @@
+name: PR label
+
+on:
+  pull_request:
+    types: [labeled, unlabeled, opened, reopened, synchronize]
+
+jobs:
+  semver-label-check:
+    name: Semantic Version label check
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Check for Semantic Version label
+        uses: apple/swift-nio/.github/actions/pull_request_semver_label_checker@main
diff --git a/.licenseignore b/.licenseignore
new file mode 100644
index 0000000..9c91245
--- /dev/null
+++ b/.licenseignore
@@ -0,0 +1,36 @@
+.gitignore
+**/.gitignore
+.licenseignore
+.gitattributes
+.git-blame-ignore-revs
+.mailfilter
+.mailmap
+.spi.yml
+.swift-format
+.editorconfig
+.github/*
+*.md
+*.txt
+*.yml
+*.yaml
+*.json
+Package.swift
+**/Package.swift
+Package@-*.swift
+**/Package@-*.swift
+Package.resolved
+**/Package.resolved
+Makefile
+*.modulemap
+**/*.modulemap
+**/*.docc/*
+*.xcprivacy
+**/*.xcprivacy
+*.symlink
+**/*.symlink
+Dockerfile
+**/Dockerfile
+Snippets/*
+dev/git.commit.template
+.unacceptablelanguageignore
+.dockerignore
diff --git a/.swift-format b/.swift-format
new file mode 100644
index 0000000..7e8ae73
--- /dev/null
+++ b/.swift-format
@@ -0,0 +1,68 @@
+{
+  "version" : 1,
+  "indentation" : {
+    "spaces" : 4
+  },
+  "tabWidth" : 4,
+  "fileScopedDeclarationPrivacy" : {
+    "accessLevel" : "private"
+  },
+  "spacesAroundRangeFormationOperators" : false,
+  "indentConditionalCompilationBlocks" : false,
+  "indentSwitchCaseLabels" : false,
+  "lineBreakAroundMultilineExpressionChainComponents" : false,
+  "lineBreakBeforeControlFlowKeywords" : false,
+  "lineBreakBeforeEachArgument" : true,
+  "lineBreakBeforeEachGenericRequirement" : true,
+  "lineLength" : 120,
+  "maximumBlankLines" : 1,
+  "respectsExistingLineBreaks" : true,
+  "prioritizeKeepingFunctionOutputTogether" : true,
+  "noAssignmentInExpressions" : {
+    "allowedFunctions" : [
+      "XCTAssertNoThrow",
+      "XCTAssertThrowsError"
+    ]
+  },
+  "rules" : {
+    "AllPublicDeclarationsHaveDocumentation" : false,
+    "AlwaysUseLiteralForEmptyCollectionInit" : false,
+    "AlwaysUseLowerCamelCase" : false,
+    "AmbiguousTrailingClosureOverload" : true,
+    "BeginDocumentationCommentWithOneLineSummary" : false,
+    "DoNotUseSemicolons" : true,
+    "DontRepeatTypeInStaticProperties" : true,
+    "FileScopedDeclarationPrivacy" : true,
+    "FullyIndirectEnum" : true,
+    "GroupNumericLiterals" : true,
+    "IdentifiersMustBeASCII" : true,
+    "NeverForceUnwrap" : false,
+    "NeverUseForceTry" : false,
+    "NeverUseImplicitlyUnwrappedOptionals" : false,
+    "NoAccessLevelOnExtensionDeclaration" : true,
+    "NoAssignmentInExpressions" : true,
+    "NoBlockComments" : true,
+    "NoCasesWithOnlyFallthrough" : true,
+    "NoEmptyTrailingClosureParentheses" : true,
+    "NoLabelsInCasePatterns" : true,
+    "NoLeadingUnderscores" : false,
+    "NoParensAroundConditions" : true,
+    "NoVoidReturnOnFunctionSignature" : true,
+    "OmitExplicitReturns" : true,
+    "OneCasePerLine" : true,
+    "OneVariableDeclarationPerLine" : true,
+    "OnlyOneTrailingClosureArgument" : true,
+    "OrderedImports" : true,
+    "ReplaceForEachWithForLoop" : true,
+    "ReturnVoidInsteadOfEmptyTuple" : true,
+    "UseEarlyExits" : false,
+    "UseExplicitNilCheckInConditions" : false,
+    "UseLetInEveryBoundCaseVariable" : false,
+    "UseShorthandTypeNames" : true,
+    "UseSingleLinePropertyGetter" : false,
+    "UseSynthesizedInitializer" : false,
+    "UseTripleSlashForDocumentationComments" : true,
+    "UseWhereClausesInForLoops" : false,
+    "ValidateDocumentationComments" : false
+  }
+}
diff --git a/.swiftformat b/.swiftformat
deleted file mode 100644
index 04c2b62..0000000
--- a/.swiftformat
+++ /dev/null
@@ -1,19 +0,0 @@
-# file options
-
---swiftversion 5.2
---exclude .build
---exclude Tests/LinuxMain.swift
---exclude **/*Tests+XCTest.swift
-
-# format options
-
---ifdef no-indent
---patternlet inline
---self insert
---stripunusedargs closure-only
---wraparguments before-first
---extensionacl on-declarations
-
-# rules
-
---disable blankLinesAroundMark
diff --git a/Benchmarks/.gitkeep b/Benchmarks/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Benchmarks/Benchmarks/TracingBenchmarks/AtrributeDSLBenchmark.swift b/Benchmarks/Benchmarks/TracingBenchmarks/AtrributeDSLBenchmark.swift
index ac4d38b..345a3ba 100644
--- a/Benchmarks/Benchmarks/TracingBenchmarks/AtrributeDSLBenchmark.swift
+++ b/Benchmarks/Benchmarks/TracingBenchmarks/AtrributeDSLBenchmark.swift
@@ -2,26 +2,26 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
 import Benchmark
-import Tracing 
+import Tracing
 
 let benchmarks = {
     let defaultMetrics: [BenchmarkMetric] = [
-        .mallocCountTotal,
+        .mallocCountTotal
     ]
 
     Benchmark(
-        "NoopTracing.startSpan/endSpan",
+        "NoopTracing.startSpan_endSpan",
         configuration: .init(
             metrics: defaultMetrics,
             timeUnits: .nanoseconds,
diff --git a/Benchmarks/Package.resolved b/Benchmarks/Package.resolved
index f606143..853efce 100644
--- a/Benchmarks/Package.resolved
+++ b/Benchmarks/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/ordo-one/package-benchmark.git",
       "state" : {
-        "revision" : "ddf6c1ae01e139120bcdb917ece52819ee69d47a",
-        "version" : "1.22.1"
+        "revision" : "d4909695344b6e1ef88f0a711df6ab8708dd135d",
+        "version" : "1.27.3"
       }
     },
     {
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
-        "revision" : "c8ed701b513cf5177118a175d85fbbbcd707ab41",
-        "version" : "1.3.0"
+        "revision" : "41982a3656a71c768319979febd796c6fd111d5c",
+        "version" : "1.5.0"
       }
     },
     {
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-service-context.git",
       "state" : {
-        "revision" : "ce0141c8f123132dbd02fd45fea448018762df1b",
-        "version" : "1.0.0"
+        "revision" : "0c62c5b4601d6c125050b5c3a97f20cce881d32b",
+        "version" : "1.1.0"
       }
     },
     {
@@ -68,8 +68,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-system",
       "state" : {
-        "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496",
-        "version" : "1.2.1"
+        "revision" : "c8a44d836fe7913603e246acab7c528c2e780168",
+        "version" : "1.4.0"
       }
     },
     {
diff --git a/Benchmarks/Package.swift b/Benchmarks/Package.swift
index db61de8..b541486 100644
--- a/Benchmarks/Package.swift
+++ b/Benchmarks/Package.swift
@@ -1,13 +1,13 @@
 // swift-tools-version: 5.9
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the SwiftCertificates open source project
+// This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2023 Apple Inc. and the SwiftCertificates project authors
+// Copyright (c) 2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftCertificates project authors
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -18,7 +18,7 @@ import PackageDescription
 let package = Package(
     name: "benchmarks",
     platforms: [
-        .macOS("14"),
+        .macOS("14")
     ],
     dependencies: [
         .package(path: "../"),
@@ -35,6 +35,6 @@ let package = Package(
             plugins: [
                 .plugin(name: "BenchmarkPlugin", package: "package-benchmark")
             ]
-        ),
+        )
     ]
-)
\ No newline at end of file
+)
diff --git a/Benchmarks/Thresholds/5.10/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json b/Benchmarks/Thresholds/5.10/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
new file mode 100644
index 0000000..282dc64
--- /dev/null
+++ b/Benchmarks/Thresholds/5.10/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 2
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/5.10/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json b/Benchmarks/Thresholds/5.10/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
new file mode 100644
index 0000000..557fc88
--- /dev/null
+++ b/Benchmarks/Thresholds/5.10/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/5.10/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json b/Benchmarks/Thresholds/5.10/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
new file mode 100644
index 0000000..9f9de44
--- /dev/null
+++ b/Benchmarks/Thresholds/5.10/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/5.9/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json b/Benchmarks/Thresholds/5.9/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
new file mode 100644
index 0000000..a072cdd
--- /dev/null
+++ b/Benchmarks/Thresholds/5.9/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 3
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/5.9/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json b/Benchmarks/Thresholds/5.9/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
new file mode 100644
index 0000000..557fc88
--- /dev/null
+++ b/Benchmarks/Thresholds/5.9/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/5.9/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json b/Benchmarks/Thresholds/5.9/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
new file mode 100644
index 0000000..9f9de44
--- /dev/null
+++ b/Benchmarks/Thresholds/5.9/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json b/Benchmarks/Thresholds/6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
new file mode 100644
index 0000000..282dc64
--- /dev/null
+++ b/Benchmarks/Thresholds/6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 2
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json b/Benchmarks/Thresholds/6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
new file mode 100644
index 0000000..557fc88
--- /dev/null
+++ b/Benchmarks/Thresholds/6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/6.0/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json b/Benchmarks/Thresholds/6.0/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
new file mode 100644
index 0000000..9f9de44
--- /dev/null
+++ b/Benchmarks/Thresholds/6.0/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/nightly-6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json b/Benchmarks/Thresholds/nightly-6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
new file mode 100644
index 0000000..282dc64
--- /dev/null
+++ b/Benchmarks/Thresholds/nightly-6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 2
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/nightly-6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json b/Benchmarks/Thresholds/nightly-6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
new file mode 100644
index 0000000..557fc88
--- /dev/null
+++ b/Benchmarks/Thresholds/nightly-6.0/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/nightly-6.0/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json b/Benchmarks/Thresholds/nightly-6.0/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
new file mode 100644
index 0000000..9f9de44
--- /dev/null
+++ b/Benchmarks/Thresholds/nightly-6.0/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/nightly-main/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json b/Benchmarks/Thresholds/nightly-main/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
new file mode 100644
index 0000000..282dc64
--- /dev/null
+++ b/Benchmarks/Thresholds/nightly-main/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes.http.status_code_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 2
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/nightly-main/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json b/Benchmarks/Thresholds/nightly-main/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
new file mode 100644
index 0000000..557fc88
--- /dev/null
+++ b/Benchmarks/Thresholds/nightly-main/TracingBenchmarks.NoopTracing.attribute:_set,_span.attributes['http.status_code']_=_200.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
\ No newline at end of file
diff --git a/Benchmarks/Thresholds/nightly-main/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json b/Benchmarks/Thresholds/nightly-main/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
new file mode 100644
index 0000000..9f9de44
--- /dev/null
+++ b/Benchmarks/Thresholds/nightly-main/TracingBenchmarks.NoopTracing.startSpan_endSpan.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 76a7f7f..8a13769 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -54,30 +54,10 @@ We require that your commit messages match our template. The easiest way to do t
 
      git config commit.template dev/git.commit.template
 
-### Run `./scripts/soundness.sh`
+### Run CI checks locally
 
-The scripts directory contains a [soundness.sh script](https://github.com/apple/swift-distributed-tracing/blob/main/scripts/soundness.sh)
-that enforces additional checks, like license headers and formatting style.
-
-Please make sure to `./scripts/soundness.sh` before pushing a change upstream, otherwise it is likely the PR validation will fail
-on minor changes such as a missing `self.` or similar formatting issues.
-
-> The script also executes the above mentioned `generate_linux_tests.rb`.
-For frequent contributors, we recommend adding the script as a [git pre-push hook](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks), which you can do via executing the following command in the project root directory:
-
- ```bash
- cat << EOF > .git/hooks/pre-push
- #!/bin/bash
- if [[ -f "scripts/soundness.sh" ]]; then
-   scripts/soundness.sh
- fi
- EOF
- ```
-
-Which makes the script execute, and only allow the `git push` to complete if the check has passed.
-
-In the case of formatting issues, you can then `git add` the formatting changes, and attempt the push again.
+You can run the Github Actions workflows locally using [act](https://github.com/nektos/act). For detailed steps on how to do this please see [https://github.com/swiftlang/github-workflows?tab=readme-ov-file#running-workflows-locally](https://github.com/swiftlang/github-workflows?tab=readme-ov-file#running-workflows-locally).
 
 ## How to contribute your work
 
-Please open a pull request at https://github.com/apple/swift-distributed-tracing. Make sure the CI passes, and then wait for code review.
\ No newline at end of file
+Please open a pull request at https://github.com/apple/swift-distributed-tracing. Make sure the CI passes, and then wait for code review.
diff --git a/Docs/SwiftDistributedTracing/empty.swift b/Docs/SwiftDistributedTracing/empty.swift
index 10626c5..55af18e 100644
--- a/Docs/SwiftDistributedTracing/empty.swift
+++ b/Docs/SwiftDistributedTracing/empty.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/IntegrationTests/allocation-counter-tests-framework/run-allocation-counter.sh b/IntegrationTests/allocation-counter-tests-framework/run-allocation-counter.sh
deleted file mode 100755
index d8ceb74..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/run-allocation-counter.sh
+++ /dev/null
@@ -1,305 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2019 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-set -eu
-here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-build_opts=( -c release )
-
-function die() {
-    echo >&2 "ERROR: $*"
-    exit 1
-}
-
-function make_git_commit_all() {
-    git init > /dev/null
-    if [[ "$(git config user.email)" == "" ]]; then
-        git config --local user.email does@really-not.matter
-        git config --local user.name 'Does Not Matter'
-    fi
-    git add . > /dev/null
-    git commit -m 'everything' > /dev/null
-}
-
-# <extra_dependencies_file> <swiftpm_pkg_name> <targets...>
-function hooked_package_swift_start() {
-    local extra_dependencies_file=$1
-    local swiftpm_pkg_name=$2
-    shift 2
-
-    cat <<"EOF"
-// swift-tools-version:5.0
-import PackageDescription
-
-let package = Package(
-    name: "allocation-counter-tests",
-    products: [
-EOF
-    for f in "$@"; do
-        local module
-        module=$(module_name_from_path "$f")
-        echo ".executable(name: \"$module\", targets: [\"bootstrap_$module\"]),"
-    done
-    cat <<EOF
-    ],
-    dependencies: [
-        .package(url: "HookedFunctions/", .branch("main")),
-        .package(url: "$swiftpm_pkg_name/", .branch("main")),
-EOF
-    if [[ -n "$extra_dependencies_file" ]]; then
-        cat "$extra_dependencies_file"
-    fi
-    cat <<EOF
-    ],
-    targets: [
-EOF
-}
-
-# <target_name> <deps...>
-function hooked_package_swift_target() {
-    local target_name="$1"
-    shift
-    local deps=""
-    for dep in "$@"; do
-        deps="$deps \"$dep\","
-    done
-    cat <<EOF
-            .target(name: "Test_$target_name", dependencies: [$deps]),
-            .target(name: "bootstrap_$target_name",
-                    dependencies: ["Test_$target_name", "HookedFunctions"]),
-EOF
-}
-
-function hooked_package_swift_end() {
-    cat <<"EOF"
-    ]
-)
-EOF
-}
-
-function abs_path() {
-    if [[ "${1:0:1}" == "/" ]]; then
-        echo "$1"
-    else
-        echo "$PWD/$1"
-    fi
-}
-
-function dir_basename() {
-    test -d "$1"
-    basename "$(cd "$1" && pwd)"
-}
-
-function fake_package_swift() {
-    cat > Package.swift <<EOF
-// swift-tools-version:5.0
-import PackageDescription
-
-let package = Package(name: "$1")
-EOF
-}
-
-# <target> <template> <swiftpm_pkg_root> <swiftpm_pkg_name> <hooked_function_module> <bootstrap_module>
-# <shared file> <extra_dependencies_file> <modules...> -- <test_files...>
-function build_package() {
-    local target=$1
-    local template=$2
-    local swiftpm_pkg_root=$3
-    local swiftpm_pkg_name=$4
-    local hooked_function_module=$5
-    local bootstrap_module=$6
-    local shared_file=$7
-    local extra_dependencies_file=$8
-    shift 8
-
-    local modules=()
-    while [[ "$1" != "--" ]]; do
-        modules+=( "$1" )
-        shift
-    done
-    shift
-
-    test -d "$target" || die "target dir '$target' not a directory"
-    test -d "$template" || die "template dir '$template' not a directory"
-    test -d "$swiftpm_pkg_root" || die "root dir '$swiftpm_pkg_root' not a directory"
-    test -n "$hooked_function_module" || die "hooked function module empty"
-    test -n "$bootstrap_module" || die "bootstrap module empty"
-
-    cp -R "$template"/* "$target/"
-    mv "$target/$hooked_function_module" "$target/HookedFunctions"
-    mv "$target/Sources/$bootstrap_module" "$target/Sources/bootstrap"
-
-    (
-    set -eu
-
-    cd "$target"
-
-    cd HookedFunctions
-    make_git_commit_all
-    cd ..
-
-    cd AtomicCounter
-    make_git_commit_all
-    cd ..
-
-    mkdir "$swiftpm_pkg_name"
-    cd "$swiftpm_pkg_name"
-    fake_package_swift "$swiftpm_pkg_name"
-    make_git_commit_all
-    cd ..
-
-    hooked_package_swift_start "$extra_dependencies_file" "$swiftpm_pkg_name" "$@" > Package.swift
-    for f in "$@"; do
-        local module
-        module=$(module_name_from_path "$f")
-        hooked_package_swift_target "$module" "${modules[@]}" >> Package.swift
-        mkdir "Sources/bootstrap_$module"
-        ln -s "../bootstrap/main.c" "Sources/bootstrap_$module"
-        mkdir "Sources/Test_$module"
-        cat > "Sources/Test_$module/trampoline.swift" <<EOF
-        @_cdecl("swift_main")
-        func swift_main() {
-            run(identifier: "$module")
-        }
-EOF
-        ln -s "$f" "Sources/Test_$module/file.swift"
-        ln -s "../../scaffolding.swift" "Sources/Test_$module/"
-        if [[ -n "$shared_file" ]]; then
-            ln -s "$shared_file" "Sources/Test_$module/shared.swift"
-        fi
-    done
-    hooked_package_swift_end >> Package.swift
-
-    swift package edit --path "$swiftpm_pkg_root" "$swiftpm_pkg_name"
-    )
-}
-
-function module_name_from_path() {
-    basename "${1%.*}" | tr ". " "__"
-}
-
-# <pkg_root>
-function find_swiftpm_package_name() {
-    (
-    set -eu
-    cd "$1"
-    swift package dump-package | grep '^  "name"' | cut -d'"' -f4
-    )
-}
-
-do_hooking=true
-pkg_root="$here/.."
-shared_file=""
-modules=()
-extra_dependencies_file=""
-tmp_dir="/tmp"
-
-while getopts "ns:p:m:d:t:" opt; do
-    case "$opt" in
-        n)
-            do_hooking=false
-            ;;
-        s)
-            shared_file="$OPTARG"
-            ;;
-        p)
-            pkg_root=$(abs_path "$OPTARG")
-            ;;
-        m)
-            modules+=( "$OPTARG" )
-            ;;
-        d)
-            extra_dependencies_file="$OPTARG"
-            ;;
-        t)
-            tmp_dir="$OPTARG"
-            ;;
-        \?)
-            die "unknown option $opt"
-            ;;
-    esac
-done
-
-shift $(( OPTIND - 1 ))
-if [[ $# -lt 1 ]]; then
-    die "not enough files provided"
-fi
-
-if [[ "${#modules}" == 0 ]]; then
-    die "no modules specified, use '-m <MODULE>' for every module you plan to use"
-fi
-
-if [[ ! -f "$pkg_root/Package.swift" ]]; then
-    die "package root '$pkg_root' doesn't contain a Package.swift file, use -p"
-fi
-
-files=()
-for f in "$@"; do
-    files+=( "$(abs_path "$f")" )
-done
-
-if [[ -n "$shared_file" ]]; then
-    shared_file=$(abs_path "$shared_file")
-fi
-
-test -d "$pkg_root" || die "package root '$pkg_root' not a directory"
-for f in "${files[@]}"; do
-    test -f "$f" || die "file '$f' not a file"
-done
-
-working_dir=$(mktemp -d "$tmp_dir/.nio_alloc_counter_tests_XXXXXX")
-
-selected_hooked_functions="HookedFunctionsDoHook"
-selected_bootstrap="bootstrapDoHook"
-
-if ! $do_hooking; then
-    selected_hooked_functions=HookedFunctionsDoNotHook
-    selected_bootstrap=bootstrapDoNotHook
-fi
-
-build_package \
-    "$working_dir" \
-    "$here/template" \
-    "$pkg_root" \
-    "$(find_swiftpm_package_name "$pkg_root")" \
-    "$selected_hooked_functions" \
-    "$selected_bootstrap" \
-    "$shared_file" \
-    "$extra_dependencies_file" \
-    "${modules[@]}" \
-    -- \
-    "${files[@]}"
-(
-set -eu
-cd "$working_dir"
-swift build "${build_opts[@]}"
-for f in "${files[@]}"; do
-    echo "- $f"
-    swift run "${build_opts[@]}" "$(module_name_from_path "$f")"
-done
-)
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/AtomicCounter/Package.swift b/IntegrationTests/allocation-counter-tests-framework/template/AtomicCounter/Package.swift
deleted file mode 100644
index 46340cc..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/AtomicCounter/Package.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-// swift-tools-version:5.0
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-import PackageDescription
-
-let package = Package(
-    name: "AtomicCounter",
-    products: [
-        .library(name: "AtomicCounter", targets: ["AtomicCounter"]),
-    ],
-    dependencies: [],
-    targets: [
-        .target(
-            name: "AtomicCounter",
-            dependencies: []
-        ),
-    ]
-)
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/AtomicCounter/Sources/AtomicCounter/include/atomic-counter.h b/IntegrationTests/allocation-counter-tests-framework/template/AtomicCounter/Sources/AtomicCounter/include/atomic-counter.h
deleted file mode 100644
index 03098d1..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/AtomicCounter/Sources/AtomicCounter/include/atomic-counter.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef ATOMIC_COUNTER
-#define ATOMIC_COUNTER
-
-#include <stdatomic.h>
-
-void inc_free_counter(void);
-void reset_free_counter(void);
-long read_free_counter(void);
-
-void inc_malloc_counter(void);
-void reset_malloc_counter(void);
-long read_malloc_counter(void);
-
-void add_malloc_bytes_counter(intptr_t v);
-void reset_malloc_bytes_counter(void);
-intptr_t read_malloc_bytes_counter(void);
-
-#endif
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/AtomicCounter/Sources/AtomicCounter/src/atomic-counter.c b/IntegrationTests/allocation-counter-tests-framework/template/AtomicCounter/Sources/AtomicCounter/src/atomic-counter.c
deleted file mode 100644
index faca860..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/AtomicCounter/Sources/AtomicCounter/src/atomic-counter.c
+++ /dev/null
@@ -1,50 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-#include <stdatomic.h>
-
-#define MAKE_COUNTER(name) /*
-*/ _Atomic long g_ ## name ## _counter = ATOMIC_VAR_INIT(0); /*
-*/ void inc_ ## name ## _counter(void) { /*
-*/    atomic_fetch_add_explicit(&g_ ## name ## _counter, 1, memory_order_relaxed); /*
-*/ } /*
-*/ /*
-*/ void add_ ## name ## _counter(intptr_t v) { /*
-*/    atomic_fetch_add_explicit(&g_ ## name ## _counter, v, memory_order_relaxed); /*
-*/ } /*
-*/ void reset_ ## name ## _counter(void) { /*
-*/     atomic_store_explicit(&g_ ## name ## _counter, 0, memory_order_relaxed); /*
-*/ } /*
-*/ /*
-*/ intptr_t read_ ## name ## _counter(void) { /*
-*/     return atomic_load_explicit(&g_ ## name ## _counter, memory_order_relaxed); /*
-*/ }
-
-MAKE_COUNTER(free)
-MAKE_COUNTER(malloc)
-MAKE_COUNTER(malloc_bytes)
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Package.swift b/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Package.swift
deleted file mode 100644
index 3a95751..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Package.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-// swift-tools-version:5.0
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-import PackageDescription
-
-let package = Package(
-    name: "HookedFunctions",
-    products: [
-        .library(name: "HookedFunctions", type: .dynamic, targets: ["HookedFunctions"]),
-    ],
-    dependencies: [
-        .package(url: "../AtomicCounter/", .branch("main")),
-    ],
-    targets: [
-        .target(name: "HookedFunctions", dependencies: ["AtomicCounter"]),
-    ]
-)
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Sources/HookedFunctions/include/hooked-functions.h b/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Sources/HookedFunctions/include/hooked-functions.h
deleted file mode 100644
index 24b006a..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Sources/HookedFunctions/include/hooked-functions.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef HOOKED_FREE
-#define HOOKED_FREE
-
-#include <stdlib.h>
-
-void *replacement_malloc(size_t size);
-void replacement_free(void *ptr);
-void *replacement_calloc(size_t nmemb, size_t size);
-void *replacement_realloc(void *ptr, size_t size);
-void *replacement_reallocf(void *ptr, size_t size);
-void *replacement_valloc(size_t size);
-int replacement_posix_memalign(void **memptr, size_t alignment, size_t size);
-
-#endif
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Sources/HookedFunctions/src/hooked-functions.c b/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Sources/HookedFunctions/src/hooked-functions.c
deleted file mode 100644
index ca1257b..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Sources/HookedFunctions/src/hooked-functions.c
+++ /dev/null
@@ -1,205 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-#define _GNU_SOURCE
-#include <dlfcn.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <stdatomic.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <atomic-counter.h>
-#include <hooked-functions.h>
-
-/* a big block of memory that we'll use for recursive mallocs */
-static char g_recursive_malloc_mem[10 * 1024 * 1024] = {0};
-/* the index of the first free byte */
-static _Atomic ptrdiff_t g_recursive_malloc_next_free_ptr = ATOMIC_VAR_INIT(0);
-
-#define DYLD_INTERPOSE(_replacement,_replacee) \
-   __attribute__((used)) static struct { const void *replacement; const void *replacee; } _interpose_##_replacee \
-            __attribute__ ((section("__DATA,__interpose"))) = { (const void *)(unsigned long)&_replacement, (const void *)(unsigned long)&_replacee };
-#define LIBC_SYMBOL(_fun) "" # _fun
-
-static __thread bool g_in_malloc = false;
-static __thread bool g_in_realloc = false;
-static __thread bool g_in_free = false;
-static __thread void *(*g_libc_malloc)(size_t) = NULL;
-static __thread void *(*g_libc_realloc)(void *, size_t) = NULL;
-static __thread void (*g_libc_free)(void *) = NULL;
-
-// this is called if malloc is called whilst trying to resolve libc's realloc.
-// we just vend out pointers to a large block in the BSS (which we never free).
-// This block should be large enough because it's only used when malloc is
-// called from dlsym which should only happen once per thread.
-static void *recursive_malloc(size_t size_in) {
-    size_t size = size_in;
-    if ((size & 0xf) != 0) {
-        // make size 16 byte aligned
-        size = (size + 0xf) & (~(size_t)0xf);
-    }
-
-    ptrdiff_t next = atomic_fetch_add_explicit(&g_recursive_malloc_next_free_ptr,
-                                               size,
-                                               memory_order_relaxed);
-    if ((size_t)next >= sizeof(g_recursive_malloc_mem)) {
-        // we ran out of memory
-        return NULL;
-    }
-    return (void *)((intptr_t)g_recursive_malloc_mem + next);
-}
-
-static bool is_recursive_malloc_block(void *ptr) {
-    uintptr_t block_begin = (uintptr_t)g_recursive_malloc_mem;
-    uintptr_t block_end = block_begin + sizeof(g_recursive_malloc_mem);
-    uintptr_t user_ptr = (uintptr_t)ptr;
-
-    return user_ptr >= block_begin && user_ptr < block_end;
-}
-
-// this is called if realloc is called whilst trying to resolve libc's realloc.
-static void *recursive_realloc(void *ptr, size_t size) {
-    // not implemented yet...
-    abort();
-}
-
-// this is called if free is called whilst trying to resolve libc's free.
-static void recursive_free(void *ptr) {
-    // not implemented yet...
-    abort();
-}
-
-#if __APPLE__
-
-/* on Darwin calling the original function is super easy, just call it, done. */
-#define JUMP_INTO_LIBC_FUN(_fun, ...) /* \
-*/ do { /* \
-*/     return _fun(__VA_ARGS__); /* \
-*/ } while(0)
-
-#else
-
-/* on other UNIX systems this is slightly harder. Basically we see if we already
- * have a thread local variable that is a pointer to the original libc function.
- * If yes, easy, call it. If no, we need to resolve it which we do by using
- * dlsym. There's only one slight problem: dlsym might call back into the
- * function we're just trying to resolve (it does call malloc). In that case
- * we need to emulate that function (named recursive_*). But that's all then.
- */
-#define JUMP_INTO_LIBC_FUN(_fun, ...) /* \
-*/ do { /* \
-*/     if (!g_libc_ ## _fun) { /* \
-*/         if (!g_in_ ## _fun) { /* \
-*/             g_in_ ## _fun = true; /* \
-*/             g_libc_ ## _fun = dlsym(RTLD_NEXT, LIBC_SYMBOL(_fun)); /* \
-*/         } else { /* \
-*/             return recursive_ ## _fun (__VA_ARGS__); /* \
-*/         } /* \
-*/     } /*
-*/     g_in_ ## _fun = false; /* \
-*/     return g_libc_ ## _fun (__VA_ARGS__); /*
-*/ } while(0)
-
-#endif
-
-void replacement_free(void *ptr) {
-    if (ptr) {
-        inc_free_counter();
-        if (!is_recursive_malloc_block(ptr)) {
-            JUMP_INTO_LIBC_FUN(free, ptr);
-        }
-    }
-}
-
-void *replacement_malloc(size_t size) {
-    inc_malloc_counter();
-    add_malloc_bytes_counter((intptr_t) size);
-
-    JUMP_INTO_LIBC_FUN(malloc, size);
-}
-
-void *replacement_realloc(void *ptr, size_t size) {
-    if (0 == size) {
-        replacement_free(ptr);
-        return NULL;
-    }
-    if (!ptr) {
-        return replacement_malloc(size);
-    }
-    inc_free_counter();
-    inc_malloc_counter();
-    add_malloc_bytes_counter((intptr_t) size);
-
-    JUMP_INTO_LIBC_FUN(realloc, ptr, size);
-}
-
-void *replacement_calloc(size_t count, size_t size) {
-    void *ptr = replacement_malloc(count * size);
-    memset(ptr, 0, count * size);
-    return ptr;
-}
-
-void *replacement_reallocf(void *ptr, size_t size) {
-    void *new_ptr = replacement_realloc(ptr, size);
-    if (!new_ptr) {
-        replacement_free(new_ptr);
-    }
-    return new_ptr;
-}
-
-void *replacement_valloc(size_t size) {
-    // not aligning correctly (should be PAGE_SIZE) but good enough
-    return replacement_malloc(size);
-}
-
-int replacement_posix_memalign(void **memptr, size_t alignment, size_t size) {
-    // not aligning correctly (should be `alignment`) but good enough
-    void *ptr = replacement_malloc(size);
-    if (ptr && memptr) {
-        *memptr = ptr;
-        return 0;
-    } else {
-        return 1;
-    }
-}
-
-#if __APPLE__
-DYLD_INTERPOSE(replacement_free, free)
-DYLD_INTERPOSE(replacement_malloc, malloc)
-DYLD_INTERPOSE(replacement_realloc, realloc)
-DYLD_INTERPOSE(replacement_calloc, calloc)
-DYLD_INTERPOSE(replacement_reallocf, reallocf)
-DYLD_INTERPOSE(replacement_valloc, valloc)
-DYLD_INTERPOSE(replacement_posix_memalign, posix_memalign)
-#endif
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Package.swift b/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Package.swift
deleted file mode 100644
index 3a95751..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Package.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-// swift-tools-version:5.0
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-import PackageDescription
-
-let package = Package(
-    name: "HookedFunctions",
-    products: [
-        .library(name: "HookedFunctions", type: .dynamic, targets: ["HookedFunctions"]),
-    ],
-    dependencies: [
-        .package(url: "../AtomicCounter/", .branch("main")),
-    ],
-    targets: [
-        .target(name: "HookedFunctions", dependencies: ["AtomicCounter"]),
-    ]
-)
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Sources/HookedFunctions/include/hooked-functions.h b/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Sources/HookedFunctions/include/hooked-functions.h
deleted file mode 100644
index e97ebea..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Sources/HookedFunctions/include/hooked-functions.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef HOOKED_FREE
-#define HOOKED_FREE
-
-#endif
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Sources/HookedFunctions/src/hooked-functions.c b/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Sources/HookedFunctions/src/hooked-functions.c
deleted file mode 100644
index 38f49a3..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Sources/HookedFunctions/src/hooked-functions.c
+++ /dev/null
@@ -1,27 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/Sources/bootstrapDoHook/main.c b/IntegrationTests/allocation-counter-tests-framework/template/Sources/bootstrapDoHook/main.c
deleted file mode 100644
index 020014b..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/Sources/bootstrapDoHook/main.c
+++ /dev/null
@@ -1,64 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <dlfcn.h>
-#include <atomic-counter.h>
-#include <hooked-functions.h>
-#include <stdlib.h>
-
-#if !__APPLE__
-void free(void *ptr) {
-    replacement_free(ptr);
-}
-void *malloc(size_t size) {
-    return replacement_malloc(size);
-}
-void *calloc(size_t nmemb, size_t size) {
-    return replacement_calloc(nmemb, size);
-}
-void *realloc(void *ptr, size_t size) {
-    return replacement_realloc(ptr, size);
-}
-void *reallocf(void *ptr, size_t size) {
-    return replacement_reallocf(ptr, size);
-}
-void *valloc(size_t size) {
-    return replacement_valloc(size);
-}
-int posix_memalign(void **memptr, size_t alignment, size_t size) {
-    return replacement_posix_memalign(memptr, alignment, size);
-}
-#endif
-
-void swift_main(void);
-
-int main() {
-    swift_main();
-}
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/Sources/bootstrapDoNotHook/main.c b/IntegrationTests/allocation-counter-tests-framework/template/Sources/bootstrapDoNotHook/main.c
deleted file mode 100644
index c2fc0fa..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/Sources/bootstrapDoNotHook/main.c
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-void swift_main(void);
-
-int main() {
-    swift_main();
-}
diff --git a/IntegrationTests/allocation-counter-tests-framework/template/scaffolding.swift b/IntegrationTests/allocation-counter-tests-framework/template/scaffolding.swift
deleted file mode 100644
index 4652c37..0000000
--- a/IntegrationTests/allocation-counter-tests-framework/template/scaffolding.swift
+++ /dev/null
@@ -1,119 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2019 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-import AtomicCounter
-import Foundation
-#if canImport(Darwin)
-import Darwin
-#elseif canImport(Glibc)
-import Glibc
-#elseif canImport(Musl)
-import Musl
-#else
-#error("Unsupported runtime")
-#endif
-
-func waitForThreadsToQuiesce(shouldReachZero: Bool) {
-    func getUnfreed() -> Int {
-        AtomicCounter.read_malloc_counter() - AtomicCounter.read_free_counter()
-    }
-
-    var oldNumberOfUnfreed = getUnfreed()
-    var count = 0
-    repeat {
-        guard count < 100 else {
-            print("WARNING: Giving up, shouldReachZero=\(shouldReachZero), unfreeds=\(oldNumberOfUnfreed)")
-            return
-        }
-        count += 1
-        usleep(shouldReachZero ? 50000 : 200_000) // allocs/frees happen on multiple threads, allow some cool down time
-        let newNumberOfUnfreed = getUnfreed()
-        if oldNumberOfUnfreed == newNumberOfUnfreed, !shouldReachZero || newNumberOfUnfreed <= 0 {
-            // nothing happened in the last 100ms, let's assume everything's
-            // calmed down already.
-            if count > 5 || newNumberOfUnfreed != 0 {
-                print("DEBUG: After waiting \(count) times, we quiesced to unfreeds=\(newNumberOfUnfreed)")
-            }
-            return
-        }
-        oldNumberOfUnfreed = newNumberOfUnfreed
-    } while true
-}
-
-func measureAll(_ fn: () -> Int) -> [[String: Int]] {
-    func measureOne(throwAway: Bool = false, _ fn: () -> Int) -> [String: Int]? {
-        AtomicCounter.reset_free_counter()
-        AtomicCounter.reset_malloc_counter()
-        AtomicCounter.reset_malloc_bytes_counter()
-        #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
-        autoreleasepool {
-            _ = fn()
-        }
-        #else
-        _ = fn()
-        #endif
-        waitForThreadsToQuiesce(shouldReachZero: !throwAway)
-        let frees = AtomicCounter.read_free_counter()
-        let mallocs = AtomicCounter.read_malloc_counter()
-        let mallocedBytes = AtomicCounter.read_malloc_bytes_counter()
-        if mallocs - frees < 0 {
-            print("WARNING: negative remaining allocation count, skipping.")
-            return nil
-        }
-        return [
-            "total_allocations": mallocs,
-            "total_allocated_bytes": mallocedBytes,
-            "remaining_allocations": mallocs - frees,
-        ]
-    }
-
-    _ = measureOne(throwAway: true, fn) /* pre-heat and throw away */
-
-    var measurements: [[String: Int]] = []
-    for _ in 0 ..< 10 {
-        if let results = measureOne(fn) {
-            measurements.append(results)
-        }
-    }
-    return measurements
-}
-
-func measureAndPrint(desc: String, fn: () -> Int) {
-    let measurements = measureAll(fn)
-    for k in measurements[0].keys {
-        let vs = measurements.map { $0[k]! }
-        print("\(desc).\(k): \(vs.min() ?? -1)")
-    }
-    print("DEBUG: \(measurements)")
-}
-
-public func measure(identifier: String, _ body: () -> Int) {
-    measureAndPrint(desc: identifier) {
-        body()
-    }
-}
diff --git a/IntegrationTests/plugin_echo.sh b/IntegrationTests/plugin_echo.sh
deleted file mode 100644
index a11ed4e..0000000
--- a/IntegrationTests/plugin_echo.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-function plugin_echo_test_suite_begin() {
-    echo "Running test suite '$1'"
-}
-
-function plugin_echo_test_suite_end() {
-    true
-}
-
-# test_name
-function plugin_echo_test_begin() {
-    echo -n "Running test '$1'... "
-}
-
-function plugin_echo_test_skip() {
-    echo "Skipping test '$1'"
-}
-
-function plugin_echo_test_ok() {
-    echo "OK (${1}s)"
-}
-
-function plugin_echo_test_fail() {
-    echo "FAILURE ($1)"
-    echo "--- OUTPUT BEGIN ---"
-    cat "$2"
-    echo "--- OUTPUT  END  ---"
-}
-
-function plugin_echo_test_end() {
-    true
-}
-
-function plugin_echo_summary_ok() {
-    echo "OK (ran $1 tests successfully)"
-}
-
-function plugin_echo_summary_fail() {
-    echo "FAILURE (oks: $1, failures: $2)"
-}
-
-function plugin_echo_init() {
-    true
-}
diff --git a/IntegrationTests/plugin_junit_xml.sh b/IntegrationTests/plugin_junit_xml.sh
deleted file mode 100644
index 3a3f6db..0000000
--- a/IntegrationTests/plugin_junit_xml.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-junit_testsuite_time=0
-
-function junit_output_write() {
-    extra_flags=""
-    if [[ "$1" == "-n" ]]; then
-        extra_flags="-n"
-        shift
-    fi
-    test -n "$junit_xml_output"
-    echo $extra_flags "$*" >> "$junit_xml_output"
-}
-
-function junit_output_cat() {
-    cat "$@" >> "$junit_xml_output"
-}
-
-# search, replace
-function junit_output_replace() {
-    test -n "$junit_xml_output"
-    case "$(uname -s)" in
-        Linux)
-            sed -i "s/$1/$2/g" "$junit_xml_output"
-            ;;
-        *)
-            sed -i "" "s/$1/$2/g" "$junit_xml_output"
-            ;;
-    esac
-}
-
-function plugin_junit_xml_test_suite_begin() {
-    junit_testsuite_time=0
-    junit_output_write "<testsuite name='$1' hostname='$(hostname)' "\
-"timestamp='$(date -u +"%Y-%m-%dT%H:%M:%S")' tests='XXX-TESTS-XXX' "\
-"failures='XXX-FAILURES-XXX' time='XXX-TIME-XXX' errors='0' id='$(date +%s)'"\
-" package='NIOIntegrationTests.$1'>"
-}
-
-function plugin_junit_xml_test_suite_end() {
-    junit_repl_success_and_fail "$1" "$2"
-    junit_output_write "</testsuite>"
-}
-
-# test_name
-function plugin_junit_xml_test_begin() {
-    junit_output_write -n "  <testcase classname='NIOIntegrationTests.$2' name='$1'"
-}
-
-function plugin_junit_xml_test_skip() {
-    true
-}
-
-function plugin_junit_xml_test_ok() {
-    time_ms=$1
-    junit_output_write " time='$time_ms'>"
-    junit_testsuite_time=$((junit_testsuite_time + time_ms))
-}
-
-function plugin_junit_xml_test_fail() {
-    time_ms=$1
-    junit_output_write " time='$time_ms'>"
-    junit_output_write "  <failure type='test_fail'>"
-    junit_output_write "    <system-out>"
-    junit_output_write '      <![CDATA['
-    junit_output_cat "$2"
-    junit_output_write '      ]]>'
-    junit_output_write "    </system-out>"
-    junit_output_write "  </failure>"
-}
-
-function plugin_junit_xml_test_end() {
-    junit_output_write "  </testcase>"
-}
-
-function junit_repl_success_and_fail() {
-    junit_output_replace XXX-TESTS-XXX "$(($1 + $2))"
-    junit_output_replace XXX-FAILURES-XXX "$2"
-    junit_output_replace XXX-TIME-XXX "$junit_testsuite_time"
-}
-
-function plugin_junit_xml_summary_ok() {
-    junit_output_write "</testsuites>"
-}
-
-function plugin_junit_xml_summary_fail() {
-    junit_output_write "</testsuites>"
-}
-
-function plugin_junit_xml_init() {
-    junit_xml_output=""
-    for f in "$@"; do
-        if [[ "$junit_xml_output" = "PLACEHOLDER" ]]; then
-            junit_xml_output="$f"
-        fi
-        if [[ "$f" == "--junit-xml" && -z "$junit_xml_output" ]]; then
-            junit_xml_output="PLACEHOLDER"
-        fi
-    done
-
-    if [[ -z "$junit_xml_output" || "$junit_xml_output" = "PLACEHOLDER" ]]; then
-        echo >&2 "ERROR: you need to specify the output after the --junit-xml argument"
-        false
-    fi
-    echo "<testsuites>" > "$junit_xml_output"
-}
diff --git a/IntegrationTests/run-single-test.sh b/IntegrationTests/run-single-test.sh
deleted file mode 100755
index 3b97953..0000000
--- a/IntegrationTests/run-single-test.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-(
-# this sub-shell is where the actual test is run
-set -eu
-set -x
-set -o pipefail
-
-test="$1"
-tmp="$2"
-root="$3"
-g_show_info="$4"
-here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$here/test_functions.sh"
-source "$test"
-wait
-)
-exit_code=$?
-exit $exit_code
diff --git a/IntegrationTests/run-tests.sh b/IntegrationTests/run-tests.sh
deleted file mode 100755
index 80848e6..0000000
--- a/IntegrationTests/run-tests.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-set -eu
-
-shopt -s nullglob
-
-here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-tmp=$(mktemp -d /tmp/.swift-nio-http1-server-sh-tests_XXXXXX)
-
-# start_time
-function time_diff_to_now() {
-    echo "$(( $(date +%s) - $1 ))"
-}
-
-function plugins_do() {
-    local method
-    method="$1"
-    shift
-    for plugin in $plugins; do
-        cd "$orig_cwd"
-        "plugin_${plugin}_${method}" "$@"
-        cd - > /dev/null
-    done
-}
-
-source "$here/plugin_echo.sh"
-source "$here/plugin_junit_xml.sh"
-
-plugins="echo"
-plugin_opts_ind=0
-if [[ "${1-default}" == "--junit-xml" ]]; then
-    plugins="echo junit_xml"
-    plugin_opts_ind=2
-fi
-
-function usage() {
-    echo >&2 "Usage: $0 [OPTIONS]"
-    echo >&2
-    echo >&2 "OPTIONS:"
-    echo >&2 "  -f FILTER: Only run tests matching FILTER (regex)"
-}
-
-orig_cwd=$(pwd)
-cd "$here"
-
-plugins_do init "$@"
-shift $plugin_opts_ind
-
-filter="."
-verbose=false
-show_info=false
-debug=false
-while getopts "f:vid" opt; do
-    case $opt in
-        f)
-            filter="$OPTARG"
-            ;;
-        v)
-            verbose=true
-            ;;
-        i)
-            show_info=true
-            ;;
-        d)
-            debug=true
-            ;;
-        \?)
-            usage
-            exit 1
-            ;;
-    esac
-done
-
-function run_test() {
-    if $verbose; then
-        "$@" 2>&1 | tee -a "$out"
-        # we need to return the return value of the first command
-        return ${PIPESTATUS[0]}
-    else
-        "$@" >> "$out" 2>&1
-    fi
-}
-
-exec 3>&1 4>&2 # copy stdout/err to fd 3/4 to we can output control messages
-cnt_ok=0
-cnt_fail=0
-for f in tests_*; do
-    suite_ok=0
-    suite_fail=0
-    plugins_do test_suite_begin "$f"
-    start_suite=$(date +%s)
-    cd "$f"
-    for t in test_*.sh; do
-        if [[ ! "$f/$t" =~ $filter ]]; then
-            plugins_do test_skip "$t"
-            continue
-        fi
-        out=$(mktemp "$tmp/test.out_XXXXXX")
-        test_tmp=$(mktemp -d "$tmp/test.tmp_XXXXXX")
-        plugins_do test_begin "$t" "$f"
-        start=$(date +%s)
-        if run_test "$here/run-single-test.sh" "$here/$f/$t" "$test_tmp" "$here/.." "$show_info"; then
-            plugins_do test_ok "$(time_diff_to_now $start)"
-            suite_ok=$((suite_ok+1))
-            if $verbose; then
-                cat "$out"
-            fi
-        else
-            plugins_do test_fail "$(time_diff_to_now $start)" "$out"
-            suite_fail=$((suite_fail+1))
-        fi
-        if ! $debug; then
-            rm "$out"
-            rm -rf "$test_tmp"
-        fi
-        plugins_do test_end
-    done
-    cnt_ok=$((cnt_ok + suite_ok))
-    cnt_fail=$((cnt_fail + suite_fail))
-    cd ..
-    plugins_do test_suite_end "$(time_diff_to_now $start_suite)" "$suite_ok" "$suite_fail"
-done
-
-if ! $debug; then
-    rm -rf "$tmp"
-else
-    echo >&2 "debug mode, not deleting '$tmp'"
-fi
-
-
-# report
-if [[ $cnt_fail > 0 ]]; then
-    # kill leftovers (the whole process group)
-    trap '' TERM
-    kill 0
-
-    plugins_do summary_fail "$cnt_ok" "$cnt_fail"
-else
-    plugins_do summary_ok "$cnt_ok" "$cnt_fail"
-fi
-
-if [[ $cnt_fail > 0 ]]; then
-    exit 1
-else
-    exit 0
-fi
diff --git a/IntegrationTests/test_functions.sh b/IntegrationTests/test_functions.sh
deleted file mode 100644
index faddb0f..0000000
--- a/IntegrationTests/test_functions.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-function fail() {
-    echo >&2 "FAILURE: $*"
-    false
-}
-
-function assert_equal() {
-    if [[ "$1" != "$2" ]]; then
-        fail "expected '$1', got '$2' ${3-}"
-    fi
-}
-
-function assert_equal_files() {
-    if ! cmp -s "$1" "$2"; then
-        diff -u "$1" "$2" || true
-        echo
-        echo "--- SNIP ($1, size=$(wc "$1"), SHA=$(shasum "$1")) ---"
-        cat "$1"
-        echo "--- SNAP ($1)---"
-        echo "--- SNIP ($2, size=$(wc "$2"), SHA=$(shasum "$2")) ---"
-        cat "$2"
-        echo "--- SNAP ($2) ---"
-        fail "file '$1' not equal to '$2'"
-    fi
-}
-
-function assert_less_than() {
-    if [[ ! "$1" -lt "$2" ]]; then
-        fail "assertion '$1' < '$2' failed"
-    fi
-}
-
-function assert_less_than_or_equal() {
-    if [[ ! "$1" -le "$2" ]]; then
-        fail "assertion '$1' <= '$2' failed"
-    fi
-}
-
-function assert_greater_than() {
-    if [[ ! "$1" -gt "$2" ]]; then
-        fail "assertion '$1' > '$2' failed"
-    fi
-}
-
-function assert_greater_than_or_equal() {
-    if [[ ! "$1" -ge "$2" ]]; then
-        fail "assertion '$1' >= '$2' failed"
-    fi
-}
-
-g_has_previously_infoed=false
-
-function info() {
-    if $g_show_info; then
-        if ! $g_has_previously_infoed; then
-            echo >&3 || true # echo an extra newline so it looks better
-            g_has_previously_infoed=true
-        fi
-        echo >&3 "info: $*" || true
-    fi
-}
-
-function warn() {
-    echo >&4 "warning: $*"
-}
diff --git a/IntegrationTests/tests_01_performance/defines.sh b/IntegrationTests/tests_01_performance/defines.sh
deleted file mode 100644
index 91d9a56..0000000
--- a/IntegrationTests/tests_01_performance/defines.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
diff --git a/IntegrationTests/tests_01_performance/test_01_allocation_counts.sh b/IntegrationTests/tests_01_performance/test_01_allocation_counts.sh
deleted file mode 100644
index c5067f8..0000000
--- a/IntegrationTests/tests_01_performance/test_01_allocation_counts.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2017-2018 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-source defines.sh
-
-set -eu
-here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-all_tests=()
-for file in "$here/test_01_resources/"test_*.swift; do
-    test_name=$(basename "$file")
-    test_name=${test_name#test_*}
-    test_name=${test_name%*.swift}
-    all_tests+=( "$test_name" )
-done
-
-"$here/test_01_resources/run-nio-alloc-counter-tests.sh" -t "$tmp" > "$tmp/output"
-
-for test in "${all_tests[@]}"; do
-    cat "$tmp/output"  # helps debugging
-
-    while read -r test_case; do
-        test_case=${test_case#test_*}
-        total_allocations=$(grep "^test_$test_case.total_allocations:" "$tmp/output" | cut -d: -f2 | sed 's/ //g')
-        not_freed_allocations=$(grep "^test_$test_case.remaining_allocations:" "$tmp/output" | cut -d: -f2 | sed 's/ //g')
-        max_allowed_env_name="MAX_ALLOCS_ALLOWED_$test_case"
-
-        info "$test_case: allocations not freed: $not_freed_allocations"
-        info "$test_case: total number of mallocs: $total_allocations"
-
-        assert_less_than "$not_freed_allocations" 5     # allow some slack
-        assert_greater_than "$not_freed_allocations" -5 # allow some slack
-        if [[ -z "${!max_allowed_env_name+x}" ]]; then
-            if [[ -z "${!max_allowed_env_name+x}" ]]; then
-                warn "no reference number of allocations set (set to \$$max_allowed_env_name)"
-                warn "to set current number:"
-                warn "    export $max_allowed_env_name=$total_allocations"
-            fi
-        else
-            max_allowed=${!max_allowed_env_name}
-            assert_less_than_or_equal "$total_allocations" "$max_allowed"
-            assert_greater_than "$total_allocations" "$(( max_allowed - 1000))"
-        fi
-    done < <(grep "^test_$test[^\W]*.total_allocations:" "$tmp/output" | cut -d: -f1 | cut -d. -f1 | sort | uniq)
-done
diff --git a/IntegrationTests/tests_01_performance/test_01_resources/README.md b/IntegrationTests/tests_01_performance/test_01_resources/README.md
deleted file mode 100644
index e172a4f..0000000
--- a/IntegrationTests/tests_01_performance/test_01_resources/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Allocation Counting Test
-
-This briefly describes how the allocation counting test works.
-
-## How does it work?
-
-This is possibly the simplest implementation that counts memory allocations (`malloc` and friends) and frees (mostly `free`). It just maintains two atomic variables which count the number of mallocs and the number of frees respectively. We run a simple HTTP1 example -- 1000 requests and responses generated by a simple SwiftNIO based client and server -- and then evaluate the number of mallocs and frees. The difference `mallocs - frees` should be pretty much 0 and the number of `mallocs` should remain stable (or decrease) across commits. We can't establish a perfect baseline as the exact number of allocations depends on your operating system, libc and Swift version.
-
-### How are the functions hooked?
-
-Usually in UNIX it's enough to just define a function, for example
-
-```C
-void free(void *ptr) { ... }
-```
-
-in the main binary and all modules will use this `free` function instead of the real one from the `libc`. For Linux, this is exactly what we're doing, the `bootstrap` binary defines such a `free` function in its `main.c`. On Darwin (macOS/iOS/...) however that is not the case and you need to use [dyld's interpose feature](https://books.google.co.uk/books?id=K8vUkpOXhN4C&lpg=PA73&ots=OMjhRWWwUu&dq=dyld%20interpose&pg=PA73#v=onepage&q=dyld%20interpose&f=false). The odd thing is that dyld's interposing _only_ works if it's in a `.dylib` and not from a binary's main executable. Therefore we need to build a slightly strange SwiftPM package:
-
-- `bootstrap`: The main executable's main module (written in C) so we can hook the `free` function on Linux.
-- `BootstrapSwift`: A SwiftPM module (written in Swift) called in from `bootstrap` which implements the actual SwiftNIO benchmark (and therefore depends on the `NIO` module).
-- `HookedFunctions`: A separate SwiftPM package that builds a shared library (`.so` on Linux, `.dylib` on Darwin) which contains the `replacement_malloc`, `replacement_free`, etc functions which just increment an atomic integers representing the number of operations. On Darwin, we use `DYLD_INTERPOSE` in this module, interposing libc functions with our `replacement_` functions. This needs to be a separate SwiftPM package as otherwise its code would just live inside of the `bootstrap` executable and the dyld interposing feature wouldn't work.
-- `AtomicCounter`: SwiftPM package (written in C) that implements the atomic counters. It needs to be a separate package as both `BoostrapSwift` (to read the allocation counter) as well as `HookedFree` (to increment the allocation counter) depend on it.
-
-## What benchmark is run?
-
-We run a single TCP connection over which 1000 HTTP requests are made by a client written in NIO, responded to by a server also written in NIO. We re-run the benchmark 10 times and return the lowest number of allocations that has been made.
-
-## Why do I have to set a baseline?
-
-By default this test should always succeed as it doesn't actually compare the number of allocations to a certain number. The reason is that this number varies ever so slightly between operating systems and Swift versions. At the time of writing on macOS we got roughly 326k allocations and on Linux 322k allocations for 1000 HTTP requests & responses. To set a baseline simply run
-
-```bash
-export MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=327000
-```
-
-or similar to set the maximum number of allocations allowed. If the benchmark exceeds these allocations the test will fail.
diff --git a/IntegrationTests/tests_01_performance/test_01_resources/run-nio-alloc-counter-tests.sh b/IntegrationTests/tests_01_performance/test_01_resources/run-nio-alloc-counter-tests.sh
deleted file mode 100755
index 277f661..0000000
--- a/IntegrationTests/tests_01_performance/test_01_resources/run-nio-alloc-counter-tests.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2019 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-set -eu
-here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-tmp_dir="/tmp"
-
-while getopts "t:" opt; do
-    case "$opt" in
-        t)
-            tmp_dir="$OPTARG"
-            ;;
-        *)
-            exit 1
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-tests_to_run=("$here"/test_*.swift)
-
-if [[ $# -gt 0 ]]; then
-    tests_to_run=("$@")
-fi
-
-"$here/../../allocation-counter-tests-framework/run-allocation-counter.sh" \
-    -p "$here/../../.." \
-    -m ServiceContext \
-    -m Instrumentation \
-    -m NIOInstrumentation \
-    -s "$here/shared.swift" \
-    -t "$tmp_dir" \
-    "${tests_to_run[@]}"
diff --git a/IntegrationTests/tests_01_performance/test_01_resources/shared.swift b/IntegrationTests/tests_01_performance/test_01_resources/shared.swift
deleted file mode 100644
index b22cf3d..0000000
--- a/IntegrationTests/tests_01_performance/test_01_resources/shared.swift
+++ /dev/null
@@ -1,62 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2019 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-import Foundation
-import ServiceContextModule
-
-@inline(never)
-func take1(context: BaggageContext) -> Int {
-    take2(context: context)
-}
-
-@inline(never)
-func take2(context: BaggageContext) -> Int {
-    take3(context: context)
-}
-
-@inline(never)
-func take3(context: BaggageContext) -> Int {
-    take4(context: context)
-}
-
-@inline(never)
-func take4(context: BaggageContext) -> Int {
-    42
-}
-
-enum StringKey1: BaggageContextKey {
-    typealias Value = String
-}
-
-enum StringKey2: BaggageContextKey {
-    typealias Value = String
-}
-
-enum StringKey3: BaggageContextKey {
-    typealias Value = String
-}
diff --git a/IntegrationTests/tests_01_performance/test_01_resources/test_001_pass_around_static_strings_small.swift b/IntegrationTests/tests_01_performance/test_01_resources/test_001_pass_around_static_strings_small.swift
deleted file mode 100644
index 04fcf09..0000000
--- a/IntegrationTests/tests_01_performance/test_01_resources/test_001_pass_around_static_strings_small.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2019 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-import ServiceContextModule
-
-func run(identifier: String) {
-    measure(identifier: identifier) {
-        var context = BaggageContext()
-        // static allocated strings
-        context[StringKey1.self] = "one"
-        context[StringKey2.self] = "two"
-        context[StringKey3.self] = "three"
-
-        var numberDone = 1
-        for _ in 0 ..< 1000 {
-            let res = take1(context: context)
-            precondition(res == 42)
-            numberDone += 1
-        }
-        return numberDone
-    }
-}
diff --git a/IntegrationTests/tests_01_performance/test_01_resources/test_002_pass_around_static_strings_large.swift b/IntegrationTests/tests_01_performance/test_01_resources/test_002_pass_around_static_strings_large.swift
deleted file mode 100644
index 60fd51e..0000000
--- a/IntegrationTests/tests_01_performance/test_01_resources/test_002_pass_around_static_strings_large.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the SwiftNIO open source project
-//
-// Copyright (c) 2017-2019 Apple Inc. and the SwiftNIO project authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-
-import ServiceContextModule
-
-func run(identifier: String) {
-    measure(identifier: identifier) {
-        var context = BaggageContext()
-        // static allocated strings
-        context[StringKey1.self] = String(repeating: "a", count: 30)
-        context[StringKey2.self] = String(repeating: "b", count: 12)
-        context[StringKey3.self] = String(repeating: "c", count: 20)
-
-        var numberDone = 1
-        for _ in 0 ..< 1000 {
-            let res = take1(context: context)
-            precondition(res == 42)
-            numberDone += 1
-        }
-        return 1
-    }
-}
diff --git a/Package.swift b/Package.swift
index 1aaf828..b1713cb 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
@@ -8,8 +8,7 @@ let package = Package(
         .library(name: "Tracing", targets: ["Tracing"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-service-context.git", from: "1.1.0"),
-        .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
+        .package(url: "https://github.com/apple/swift-service-context.git", from: "1.1.0")
     ],
     targets: [
         // ==== --------------------------------------------------------------------------------------------------------
@@ -18,13 +17,13 @@ let package = Package(
         .target(
             name: "Instrumentation",
             dependencies: [
-                .product(name: "ServiceContextModule", package: "swift-service-context"),
+                .product(name: "ServiceContextModule", package: "swift-service-context")
             ]
         ),
         .testTarget(
             name: "InstrumentationTests",
             dependencies: [
-                .target(name: "Instrumentation"),
+                .target(name: "Instrumentation")
             ]
         ),
 
@@ -41,7 +40,7 @@ let package = Package(
         .testTarget(
             name: "TracingTests",
             dependencies: [
-                .target(name: "Tracing"),
+                .target(name: "Tracing")
             ]
         ),
     ]
diff --git a/README.md b/README.md
index 832cee3..e37bbf5 100644
--- a/README.md
+++ b/README.md
@@ -49,21 +49,3 @@ If you know of any other library please send in a [pull request](https://github.
 ## Reference Documentation
 
 Please refer to the **[reference documentation](https://swiftpackageindex.com/apple/swift-distributed-tracing/documentation/tracing)** for detailed guides about adopting distributed tracing in your applications, libraries and frameworks.
-
----
-
-## Contributing
-
-Please make sure to run the `./scripts/soundness.sh` script when contributing, it checks formatting and similar things.
-
-You can ensure it always is run and passes before you push by installing a pre-push hook with git:
-
-``` sh
-echo './scripts/soundness.sh' > .git/hooks/pre-push
-```
-
-### Formatting 
-
-We use a specific version of [`nicklockwood/swiftformat`](https://github.com/nicklockwood/swiftformat).
-Please take a look at our [`Dockerfile`](docker/Dockerfile) to see which version is currently being used and install it
-on your machine before running the script.
diff --git a/Samples/Dinner/Package.swift b/Samples/Dinner/Package.swift
index 3e30e30..23cb011 100644
--- a/Samples/Dinner/Package.swift
+++ b/Samples/Dinner/Package.swift
@@ -1,13 +1,27 @@
 // swift-tools-version:5.3
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift Distributed Tracing open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift Distributed Tracing project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
 import PackageDescription
 
 let package = Package(
     name: "onboarding",
     platforms: [
-        .macOS("13.0.0"),
+        .macOS("13.0.0")
     ],
     products: [
-        .executable(name: "onboarding", targets: ["Onboarding"]),
+        .executable(name: "onboarding", targets: ["Onboarding"])
     ],
     dependencies: [
         // This example uses the following tracer implementation:
@@ -15,9 +29,12 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-log.git", from: "1.5.0"),
     ],
     targets: [
-        .target(name: "Onboarding", dependencies: [
-            .product(name: "OpenTelemetry", package: "swift-otel"),
-            .product(name: "OtlpGRPCSpanExporting", package: "swift-otel"),
-        ]),
+        .target(
+            name: "Onboarding",
+            dependencies: [
+                .product(name: "OpenTelemetry", package: "swift-otel"),
+                .product(name: "OtlpGRPCSpanExporting", package: "swift-otel"),
+            ]
+        )
     ]
 )
diff --git a/Samples/Dinner/Sources/Onboarding/Clock+Extensions.swift b/Samples/Dinner/Sources/Onboarding/Clock+Extensions.swift
index 7d0b38c..b302735 100644
--- a/Samples/Dinner/Sources/Onboarding/Clock+Extensions.swift
+++ b/Samples/Dinner/Sources/Onboarding/Clock+Extensions.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -19,6 +19,7 @@
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/Samples/Dinner/Sources/Onboarding/Dinner.swift b/Samples/Dinner/Sources/Onboarding/Dinner.swift
index 537601a..3779ea0 100644
--- a/Samples/Dinner/Sources/Onboarding/Dinner.swift
+++ b/Samples/Dinner/Sources/Onboarding/Dinner.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -19,6 +19,7 @@
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -55,7 +56,7 @@ func chop(_ vegetable: Vegetable, tracer: any Tracer) async throws -> Vegetable
     await tracer.withSpan("chop-\(vegetable)") { _ in
         await sleep(for: .seconds(5))
         // ...
-        return vegetable // "chopped"
+        return vegetable  // "chopped"
     }
 }
 
diff --git a/Samples/Dinner/Sources/Onboarding/Model.swift b/Samples/Dinner/Sources/Onboarding/Model.swift
index 2ff0b77..9d249ba 100644
--- a/Samples/Dinner/Sources/Onboarding/Model.swift
+++ b/Samples/Dinner/Sources/Onboarding/Model.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -19,6 +19,7 @@
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/Samples/Dinner/Sources/Onboarding/main.swift b/Samples/Dinner/Sources/Onboarding/main.swift
index 1f3e9b7..1768f70 100644
--- a/Samples/Dinner/Sources/Onboarding/main.swift
+++ b/Samples/Dinner/Sources/Onboarding/main.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -19,6 +19,7 @@
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/Sources/Instrumentation/Instrument.swift b/Sources/Instrumentation/Instrument.swift
index c80444f..156b311 100644
--- a/Sources/Instrumentation/Instrument.swift
+++ b/Sources/Instrumentation/Instrument.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -52,7 +52,7 @@ public protocol Instrument: Sendable {
     ///   - context: The `ServiceContext` into which these values should be injected.
     ///   - extractor: The ``Extractor`` that extracts values from the given `Carrier`.
     func extract<Carrier, Extract>(_ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract)
-        where Extract: Extractor, Extract.Carrier == Carrier
+    where Extract: Extractor, Extract.Carrier == Carrier
 
     /// Extract values from a `ServiceContext` and inject them into the given `Carrier` using the given ``Injector``.
     ///
@@ -61,5 +61,5 @@ public protocol Instrument: Sendable {
     ///   - carrier: The `Carrier` into which this information will be injected.
     ///   - injector: The ``Injector`` used to inject extracted `ServiceContext` into the given `Carrier`.
     func inject<Carrier, Inject>(_ context: ServiceContext, into carrier: inout Carrier, using injector: Inject)
-        where Inject: Injector, Inject.Carrier == Carrier
+    where Inject: Injector, Inject.Carrier == Carrier
 }
diff --git a/Sources/Instrumentation/InstrumentationSystem.swift b/Sources/Instrumentation/InstrumentationSystem.swift
index ae4da76..d0ebee0 100644
--- a/Sources/Instrumentation/InstrumentationSystem.swift
+++ b/Sources/Instrumentation/InstrumentationSystem.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -22,7 +22,7 @@ import ServiceContextModule
 ///
 /// # Access the Instrument
 /// ``instrument``: Returns whatever you passed to ``bootstrap(_:)`` as an ``Instrument``.
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public enum InstrumentationSystem {
     /// Marked as @unchecked Sendable due to the synchronization being
     /// performed manually using locks.
@@ -34,7 +34,8 @@ public enum InstrumentationSystem {
         func bootstrap(_ instrument: Instrument) {
             self.lock.withWriterLock {
                 precondition(
-                    !self._isInitialized, """
+                    !self._isInitialized,
+                    """
                     InstrumentationSystem can only be initialized once per process. Consider using MultiplexInstrument if
                     you need to use multiple instruments.
                     """
@@ -92,7 +93,7 @@ public enum InstrumentationSystem {
     }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 extension InstrumentationSystem {
     /// INTERNAL API: Do Not Use
     public static func _findInstrument(where predicate: (Instrument) -> Bool) -> Instrument? {
diff --git a/Sources/Instrumentation/Locks.swift b/Sources/Instrumentation/Locks.swift
index 637493b..671a811 100644
--- a/Sources/Instrumentation/Locks.swift
+++ b/Sources/Instrumentation/Locks.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -41,7 +41,7 @@ import Musl
 /// This object provides a lock on top of a single `pthread_mutex_t`. This kind
 /// of lock is safe to use with `libpthread`-based threading models, such as the
 /// one used by NIO.
-@_spi(Locking) /* Use the `package` access modifier once min Swift version is increased. */
+@_spi(Locking)  // Use the `package` access modifier once min Swift version is increased.
 public final class ReadWriteLock {
     private let rwlock: UnsafeMutablePointer<pthread_rwlock_t> = UnsafeMutablePointer.allocate(capacity: 1)
 
@@ -125,7 +125,7 @@ extension ReadWriteLock {
 ///
 /// Marked as @unchecked Sendable due to the synchronization being
 /// performed manually using locks.
-@_spi(Locking) /* Use the `package` access modifier once min Swift version is increased. */
+@_spi(Locking)  // Use the `package` access modifier once min Swift version is increased.
 public final class LockedValueBox<Value: Sendable>: @unchecked Sendable {
     private let lock = ReadWriteLock()
     private var value: Value
diff --git a/Sources/Instrumentation/MultiplexInstrument.swift b/Sources/Instrumentation/MultiplexInstrument.swift
index 3a56807..b35bc82 100644
--- a/Sources/Instrumentation/MultiplexInstrument.swift
+++ b/Sources/Instrumentation/MultiplexInstrument.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -36,14 +36,16 @@ extension MultiplexInstrument {
 
 extension MultiplexInstrument: Instrument {
     public func inject<Carrier, Inject>(_ context: ServiceContext, into carrier: inout Carrier, using injector: Inject)
-        where Inject: Injector, Carrier == Inject.Carrier
-    {
-        self.instruments.forEach { $0.inject(context, into: &carrier, using: injector) }
+    where Inject: Injector, Carrier == Inject.Carrier {
+        for instrument in self.instruments { instrument.inject(context, into: &carrier, using: injector) }
     }
 
-    public func extract<Carrier, Extract>(_ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract)
-        where Extract: Extractor, Carrier == Extract.Carrier
-    {
-        self.instruments.forEach { $0.extract(carrier, into: &context, using: extractor) }
+    public func extract<Carrier, Extract>(
+        _ carrier: Carrier,
+        into context: inout ServiceContext,
+        using extractor: Extract
+    )
+    where Extract: Extractor, Carrier == Extract.Carrier {
+        for instrument in self.instruments { instrument.extract(carrier, into: &context, using: extractor) }
     }
 }
diff --git a/Sources/Instrumentation/NoOpInstrument.swift b/Sources/Instrumentation/NoOpInstrument.swift
index 965abf0..bcf3644 100644
--- a/Sources/Instrumentation/NoOpInstrument.swift
+++ b/Sources/Instrumentation/NoOpInstrument.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -19,14 +19,16 @@ public struct NoOpInstrument: Instrument {
     public init() {}
 
     public func inject<Carrier, Inject>(_ context: ServiceContext, into carrier: inout Carrier, using injector: Inject)
-        where Inject: Injector, Carrier == Inject.Carrier
-    {
+    where Inject: Injector, Carrier == Inject.Carrier {
         // no-op
     }
 
-    public func extract<Carrier, Extract>(_ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract)
-        where Extract: Extractor, Carrier == Extract.Carrier
-    {
+    public func extract<Carrier, Extract>(
+        _ carrier: Carrier,
+        into context: inout ServiceContext,
+        using extractor: Extract
+    )
+    where Extract: Extractor, Carrier == Extract.Carrier {
         // no-op
     }
 }
diff --git a/Sources/Tracing/InstrumentationSystem+Tracing.swift b/Sources/Tracing/InstrumentationSystem+Tracing.swift
index ad25c62..424984d 100644
--- a/Sources/Tracing/InstrumentationSystem+Tracing.swift
+++ b/Sources/Tracing/InstrumentationSystem+Tracing.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/Sources/Tracing/NoOpTracer.swift b/Sources/Tracing/NoOpTracer.swift
index 5e4a598..244f4ef 100644
--- a/Sources/Tracing/NoOpTracer.swift
+++ b/Sources/Tracing/NoOpTracer.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -17,7 +17,7 @@ import Dispatch
 @_exported import ServiceContextModule
 
 /// Tracer that ignores all operations, used when no tracing is required.
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public struct NoOpTracer: LegacyTracer {
     public typealias Span = NoOpSpan
 
@@ -38,14 +38,16 @@ public struct NoOpTracer: LegacyTracer {
     public func forceFlush() {}
 
     public func inject<Carrier, Inject>(_ context: ServiceContext, into carrier: inout Carrier, using injector: Inject)
-        where Inject: Injector, Carrier == Inject.Carrier
-    {
+    where Inject: Injector, Carrier == Inject.Carrier {
         // no-op
     }
 
-    public func extract<Carrier, Extract>(_ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract)
-        where Extract: Extractor, Carrier == Extract.Carrier
-    {
+    public func extract<Carrier, Extract>(
+        _ carrier: Carrier,
+        into context: inout ServiceContext,
+        using extractor: Extract
+    )
+    where Extract: Extractor, Carrier == Extract.Carrier {
         // no-op
     }
 
@@ -74,7 +76,11 @@ public struct NoOpTracer: LegacyTracer {
 
         public func addEvent(_ event: SpanEvent) {}
 
-        public func recordError<Instant: TracerInstant>(_ error: Error, attributes: SpanAttributes, at instant: @autoclosure () -> Instant) {}
+        public func recordError<Instant: TracerInstant>(
+            _ error: Error,
+            attributes: SpanAttributes,
+            at instant: @autoclosure () -> Instant
+        ) {}
 
         public var attributes: SpanAttributes {
             get {
diff --git a/Sources/Tracing/SpanProtocol.swift b/Sources/Tracing/SpanProtocol.swift
index 693c1c1..ac24ee7 100644
--- a/Sources/Tracing/SpanProtocol.swift
+++ b/Sources/Tracing/SpanProtocol.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -252,13 +252,14 @@ public protocol SpanAttributeNamespace {
 
     var attributes: SpanAttributes { get set }
 
-    subscript<T>(dynamicMember dynamicMember: KeyPath<NestedSpanAttributes, SpanAttributeKey<T>>) -> T? where T: SpanAttributeConvertible {
+    subscript<T>(dynamicMember dynamicMember: KeyPath<NestedSpanAttributes, SpanAttributeKey<T>>) -> T?
+    where T: SpanAttributeConvertible {
         get
         set
     }
 
     subscript<Namespace>(dynamicMember dynamicMember: KeyPath<SpanAttribute, Namespace>) -> Namespace
-        where Namespace: SpanAttributeNamespace
+    where Namespace: SpanAttributeNamespace
     {
         get
     }
@@ -286,7 +287,7 @@ extension NestedSpanAttributesProtocol {
 
 extension SpanAttributeNamespace {
     public subscript<T>(dynamicMember dynamicMember: KeyPath<NestedSpanAttributes, SpanAttributeKey<T>>) -> T?
-        where T: SpanAttributeConvertible
+    where T: SpanAttributeConvertible
     {
         get {
             let key = NestedSpanAttributes.__namespace[keyPath: dynamicMember]
@@ -319,8 +320,7 @@ extension SpanAttributeNamespace {
     }
 
     public subscript<Namespace>(dynamicMember dynamicMember: KeyPath<SpanAttribute, Namespace>) -> Namespace
-        where Namespace: SpanAttributeNamespace
-    {
+    where Namespace: SpanAttributeNamespace {
         SpanAttribute.int(0)[keyPath: dynamicMember]
     }
 }
@@ -605,8 +605,8 @@ extension SpanAttributes {
 
     /// - Parameter callback: The function to call for each attribute.
     public func forEach(_ callback: (String, SpanAttribute) -> Void) {
-        self._attributes.forEach {
-            callback($0.key, $0.1)
+        for (key, value) in self._attributes {
+            callback(key, value)
         }
     }
 
@@ -644,8 +644,7 @@ extension SpanAttributes {
 
     /// Enables for type-safe nested namespaces for attribute accessors.
     public subscript<Namespace>(dynamicMember dynamicMember: KeyPath<SpanAttribute, Namespace>) -> Namespace
-        where Namespace: SpanAttributeNamespace
-    {
+    where Namespace: SpanAttributeNamespace {
         SpanAttribute._namespace[keyPath: dynamicMember]
     }
 }
@@ -733,7 +732,7 @@ public struct SpanLink {
 }
 
 extension SpanAttributes: Sendable {}
-extension SpanAttribute: Sendable {} // @unchecked because some payloads are CustomStringConvertible
+extension SpanAttribute: Sendable {}  // @unchecked because some payloads are CustomStringConvertible
 extension SpanStatus: Sendable {}
 extension SpanEvent: Sendable {}
 extension SpanKind: Sendable {}
diff --git a/Sources/Tracing/Tracer.swift b/Sources/Tracing/Tracer.swift
index cddc4c3..e87c8c6 100644
--- a/Sources/Tracing/Tracer.swift
+++ b/Sources/Tracing/Tracer.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -40,7 +40,7 @@ import Dispatch
 ///   - function: The function name in which the span was started
 ///   - fileID: The `fileID` where the span was started.
 ///   - line: The file line where the span was started.
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public func startSpan<Instant: TracerInstant>(
     _ operationName: String,
     at instant: @autoclosure () -> Instant,
@@ -86,7 +86,7 @@ public func startSpan<Instant: TracerInstant>(
 ///   - function: The function name in which the span was started
 ///   - fileID: The `fileID` where the span was started.
 ///   - line: The file line where the span was started.
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public func startSpan(
     _ operationName: String,
     context: @autoclosure () -> ServiceContext = .current ?? .topLevel,
@@ -132,7 +132,7 @@ public func startSpan(
 ///   - function: The function name in which the span was started
 ///   - fileID: The `fileID` where the span was started.
 ///   - line: The file line where the span was started.
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public func startSpan(
     _ operationName: String,
     context: @autoclosure () -> ServiceContext = .current ?? .topLevel,
@@ -180,7 +180,7 @@ public func startSpan(
 ///   - operation: The operation that this span should be measuring
 /// - Returns: the value returned by `operation`
 /// - Throws: the error the `operation` has thrown (if any)
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public func withSpan<T, Instant: TracerInstant>(
     _ operationName: String,
     at instant: @autoclosure () -> Instant,
@@ -226,7 +226,7 @@ public func withSpan<T, Instant: TracerInstant>(
 ///   - operation: The operation that this span should be measuring
 /// - Returns: the value returned by `operation`
 /// - Throws: the error the `operation` has thrown (if any)
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public func withSpan<T>(
     _ operationName: String,
     context: @autoclosure () -> ServiceContext = .current ?? .topLevel,
@@ -323,13 +323,13 @@ public func withSpan<T>(
 /// - Returns: the value returned by `operation`
 /// - Throws: the error the `operation` has thrown (if any)
 #if compiler(>=6.0)
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public func withSpan<T, Instant: TracerInstant>(
     _ operationName: String,
     at instant: @autoclosure () -> Instant,
     context: @autoclosure () -> ServiceContext = .current ?? .topLevel,
     ofKind kind: SpanKind = .internal,
-    isolation: isolated(any Actor)? = #isolation,
+    isolation: isolated (any Actor)? = #isolation,
     function: String = #function,
     file fileID: String = #fileID,
     line: UInt = #line,
@@ -350,10 +350,9 @@ public func withSpan<T, Instant: TracerInstant>(
 #endif
 
 #if compiler(>=6.0)
-@_disfavoredOverload
-@available(*, deprecated, message: "Prefer #isolation version of this API")
+@_disfavoredOverload@available(*, deprecated, message: "Prefer #isolation version of this API")
 #endif
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public func withSpan<T, Instant: TracerInstant>(
     _ operationName: String,
     at instant: @autoclosure () -> Instant,
@@ -401,12 +400,12 @@ public func withSpan<T, Instant: TracerInstant>(
 /// - Returns: the value returned by `operation`
 /// - Throws: the error the `operation` has thrown (if any)
 #if compiler(>=6.0)
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public func withSpan<T>(
     _ operationName: String,
     context: @autoclosure () -> ServiceContext = .current ?? .topLevel,
     ofKind kind: SpanKind = .internal,
-    isolation: isolated(any Actor)? = #isolation,
+    isolation: isolated (any Actor)? = #isolation,
     function: String = #function,
     file fileID: String = #fileID,
     line: UInt = #line,
@@ -427,10 +426,9 @@ public func withSpan<T>(
 #endif
 
 #if compiler(>=6.0)
-@_disfavoredOverload
-@available(*, deprecated, message: "Prefer #isolation version of this API")
+@_disfavoredOverload@available(*, deprecated, message: "Prefer #isolation version of this API")
 #endif
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public func withSpan<T>(
     _ operationName: String,
     context: @autoclosure () -> ServiceContext = .current ?? .topLevel,
@@ -484,7 +482,7 @@ public func withSpan<T>(
     context: @autoclosure () -> ServiceContext = .current ?? .topLevel,
     ofKind kind: SpanKind = .internal,
     at instant: @autoclosure () -> some TracerInstant = DefaultTracerClock.now,
-    isolation: isolated(any Actor)? = #isolation,
+    isolation: isolated (any Actor)? = #isolation,
     function: String = #function,
     file fileID: String = #fileID,
     line: UInt = #line,
@@ -505,8 +503,7 @@ public func withSpan<T>(
 #endif
 
 #if compiler(>=6.0)
-@_disfavoredOverload
-@available(*, deprecated, message: "Prefer #isolation version of this API")
+@_disfavoredOverload@available(*, deprecated, message: "Prefer #isolation version of this API")
 #endif
 @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 public func withSpan<T>(
diff --git a/Sources/Tracing/TracerProtocol+Legacy.swift b/Sources/Tracing/TracerProtocol+Legacy.swift
index b79135b..2424e32 100644
--- a/Sources/Tracing/TracerProtocol+Legacy.swift
+++ b/Sources/Tracing/TracerProtocol+Legacy.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -24,7 +24,7 @@ import Dispatch
 /// When possible, prefer using ``Tracer`` and ``withSpan(_:context:ofKind:at:function:file:line:_:)-8gw3v`` APIs,
 /// rather than these `startAnySpan` APIs which unconditionally always return existential Spans even when not necessary
 /// (under Swift 5.7+ type-system enhancement wrt. protocols with associated types)..
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 @available(*, deprecated, renamed: "Tracer")
 public protocol LegacyTracer: Instrument {
     /// Start a new span returning an existential ``Span`` reference.
@@ -80,7 +80,7 @@ public protocol LegacyTracer: Instrument {
 // ==== ------------------------------------------------------------------
 // MARK: Legacy implementations for Swift 5.7
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 extension LegacyTracer {
     // ==== startSpan ---------------------------------------------------------
 
@@ -231,7 +231,7 @@ extension LegacyTracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
 
@@ -313,7 +313,7 @@ extension LegacyTracer {
         at instant: @autoclosure () -> Instant,
         context: @autoclosure () -> ServiceContext = .current ?? .topLevel,
         ofKind kind: SpanKind = .internal,
-        isolation: isolated(any Actor)? = #isolation,
+        isolation: isolated (any Actor)? = #isolation,
         function: String = #function,
         file fileID: String = #fileID,
         line: UInt = #line,
@@ -335,14 +335,14 @@ extension LegacyTracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
     #endif
 
     #if compiler(>=6.0)
-    @_disfavoredOverload
-    @available(*, deprecated, message: "Prefer #isolation version of this API")
+    // swift-format-ignore: Spacing // fights with formatter
+    @_disfavoredOverload@available(*, deprecated, message: "Prefer #isolation version of this API")
     #endif
     public func withAnySpan<T, Instant: TracerInstant>(
         _ operationName: String,
@@ -370,7 +370,7 @@ extension LegacyTracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
 
@@ -426,14 +426,14 @@ extension LegacyTracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
     #endif
 
     #if compiler(>=6.0)
-    @_disfavoredOverload
-    @available(*, deprecated, message: "Prefer #isolation version of this API")
+    // swift-format-ignore: Spacing // fights with formatter
+    @_disfavoredOverload@available(*, deprecated, message: "Prefer #isolation version of this API")
     #endif
     public func withAnySpan<T>(
         _ operationName: String,
@@ -460,14 +460,12 @@ extension LegacyTracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
 }
 
-#if swift(>=5.7.0)
-// Provide compatibility shims of the `...AnySpan` APIs to the 5.7 requiring `Tracer`.
-
+// Provide compatibility shims of the `...AnySpan` APIs
 @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 extension Tracer {
     /// Start a new span returning an existential ``Span`` reference.
@@ -633,8 +631,8 @@ extension Tracer {
     #endif
 
     #if compiler(>=6.0)
-    @_disfavoredOverload
-    @available(*, deprecated, message: "Prefer #isolation version of this API")
+    // swift-format-ignore: Spacing // fights with formatter
+    @_disfavoredOverload@available(*, deprecated, message: "Prefer #isolation version of this API")
     #endif
     public func withAnySpan<T>(
         _ operationName: String,
@@ -659,4 +657,3 @@ extension Tracer {
         }
     }
 }
-#endif
diff --git a/Sources/Tracing/TracerProtocol.swift b/Sources/Tracing/TracerProtocol.swift
index 02e6d13..4fdbea8 100644
--- a/Sources/Tracing/TracerProtocol.swift
+++ b/Sources/Tracing/TracerProtocol.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -21,7 +21,7 @@
 /// A tracer capable of creating new trace spans.
 ///
 /// A tracer is a special kind of instrument with the added ability to start a ``Span``.
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 public protocol Tracer: LegacyTracer {
     /// The concrete type of span this tracer will be producing/
     associatedtype Span: Tracing.Span
@@ -61,7 +61,7 @@ public protocol Tracer: LegacyTracer {
     ) -> Self.Span
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 extension Tracer {
     /// Start a new ``Span`` with the given `ServiceContext`.
     ///
@@ -162,7 +162,7 @@ extension Tracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
 
@@ -182,7 +182,6 @@ extension Tracer {
     ///   - operationName: The name of the operation being traced. This may be a handler function, database call, ...
     ///   - context: The `ServiceContext` providing information on where to start the new ``Span``.
     ///   - kind: The ``SpanKind`` of the new ``Span``.
-    ///   - instant: the time instant at which the span started
     ///   - function: The function name in which the span was started
     ///   - fileID: The `fileID` where the span was started.
     ///   - line: The file line where the span was started.
@@ -214,7 +213,7 @@ extension Tracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
 
@@ -269,14 +268,14 @@ extension Tracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
     #endif
 
     #if compiler(>=6.0)
-    @_disfavoredOverload
-    @available(*, deprecated, message: "Prefer #isolation version of this API")
+    // swift-format-ignore: Spacing // fights with formatter
+    @_disfavoredOverload@available(*, deprecated, message: "Prefer #isolation version of this API")
     #endif
     public func withSpan<T>(
         _ operationName: String,
@@ -303,7 +302,7 @@ extension Tracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
 
@@ -359,14 +358,14 @@ extension Tracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
     #endif
 
     #if compiler(>=6.0)
-    @_disfavoredOverload
-    @available(*, deprecated, message: "Prefer #isolation version of this API")
+    // swift-format-ignore: Spacing // fights with formatter
+    @_disfavoredOverload@available(*, deprecated, message: "Prefer #isolation version of this API")
     #endif
     public func withSpan<T>(
         _ operationName: String,
@@ -394,7 +393,7 @@ extension Tracer {
             }
         } catch {
             span.recordError(error)
-            throw error // rethrow
+            throw error  // rethrow
         }
     }
 }
diff --git a/Sources/Tracing/TracingTime.swift b/Sources/Tracing/TracingTime.swift
index 4fe0c48..3fd8930 100644
--- a/Sources/Tracing/TracingTime.swift
+++ b/Sources/Tracing/TracingTime.swift
@@ -2,16 +2,19 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
+@_exported import Instrumentation
+@_exported import ServiceContextModule
+
 #if canImport(Darwin)
 import Darwin
 #elseif canImport(Glibc)
@@ -22,9 +25,6 @@ import Musl
 #error("Unsupported runtime")
 #endif
 
-@_exported import Instrumentation
-@_exported import ServiceContextModule
-
 public protocol TracerInstant: Comparable, Hashable, Sendable {
     /// Representation of this instant as the number of nanoseconds since UNIX Epoch (January 1st 1970)
     var nanosecondsSinceEpoch: UInt64 { get }
diff --git a/Sources/_TracingBenchmarks/SpanAttributesDSLBenchmark.swift b/Sources/_TracingBenchmarks/SpanAttributesDSLBenchmark.swift
index db460c1..e93e8b2 100644
--- a/Sources/_TracingBenchmarks/SpanAttributesDSLBenchmark.swift
+++ b/Sources/_TracingBenchmarks/SpanAttributesDSLBenchmark.swift
@@ -2,21 +2,22 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
-import _TracingBenchmarkTools
-import Tracing
 @_spi(Locking) import Instrumentation
+import Tracing
+import _TracingBenchmarkTools
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+// swift-format-ignore: DontRepeatTypeInStaticProperties
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 enum DSLBenchmarks {
     public static let SpanAttributesDSLBenchmarks: [BenchmarkInfo] = [
         BenchmarkInfo(
@@ -76,7 +77,7 @@ enum DSLBenchmarks {
 
     fileprivate static func runTimesWithSpan(_ times: Int, work: (any Tracing.Span) -> Void) {
         self.span.withValue { span in
-            for _ in 0 ..< times {
+            for _ in 0..<times {
                 work(span!)
             }
         }
@@ -100,14 +101,14 @@ enum DSLBenchmarks {
     static func bench_empty(times: Int) throws {}
 
     static func bench_makeSpan(times: Int) throws {
-        for _ in 0 ..< times {
+        for _ in 0..<times {
             let span = InstrumentationSystem.legacyTracer.startAnySpan("something", context: .topLevel)
             _ = span
         }
     }
 
     static func bench_startSpan_end(times: Int) throws {
-        for _ in 0 ..< times {
+        for _ in 0..<times {
             let span = InstrumentationSystem.legacyTracer.startAnySpan("something", context: .topLevel)
             span.end()
         }
@@ -160,7 +161,7 @@ enum DSLBenchmarks {
     }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) // for TaskLocal ServiceContext
+@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)  // for TaskLocal ServiceContext
 extension SpanAttributes {
     var http: DSLBenchmarks.HTTPAttributes {
         get {
diff --git a/Sources/_TracingBenchmarks/main.swift b/Sources/_TracingBenchmarks/main.swift
index 778602c..fe21be9 100644
--- a/Sources/_TracingBenchmarks/main.swift
+++ b/Sources/_TracingBenchmarks/main.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -14,13 +14,15 @@
 
 import _TracingBenchmarkTools
 
-assert({
-    print("===========================================================================")
-    print("=          !!  YOU ARE RUNNING BENCHMARKS IN DEBUG MODE  !!               =")
-    print("=     When running on the command line, use: `swift run -c release`       =")
-    print("===========================================================================")
-    return true
-}())
+assert(
+    {
+        print("===========================================================================")
+        print("=          !!  YOU ARE RUNNING BENCHMARKS IN DEBUG MODE  !!               =")
+        print("=     When running on the command line, use: `swift run -c release`       =")
+        print("===========================================================================")
+        return true
+    }()
+)
 
 @inline(__always)
 private func registerBenchmark(_ bench: BenchmarkInfo) {
@@ -33,11 +35,15 @@ private func registerBenchmark(_ benches: [BenchmarkInfo]) {
 }
 
 @inline(__always)
-private func registerBenchmark(_ name: String, _ function: @escaping @Sendable (Int) -> Void, _ tags: [BenchmarkCategory]) {
+private func registerBenchmark(
+    _ name: String,
+    _ function: @escaping @Sendable (Int) -> Void,
+    _ tags: [BenchmarkCategory]
+) {
     registerBenchmark(BenchmarkInfo(name: name, runFunction: function, tags: tags))
 }
 
-if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) { // for TaskLocal ServiceContext
+if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {  // for TaskLocal ServiceContext
     registerBenchmark(DSLBenchmarks.SpanAttributesDSLBenchmarks)
     main()
 }
diff --git a/Tests/InstrumentationTests/InstrumentTests.swift b/Tests/InstrumentationTests/InstrumentTests.swift
index 5da7067..9e74d51 100644
--- a/Tests/InstrumentationTests/InstrumentTests.swift
+++ b/Tests/InstrumentationTests/InstrumentTests.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -32,11 +32,14 @@ final class InstrumentTests: XCTestCase {
         var subsequentRequestHeaders = ["Accept": "application/json"]
         instrument.inject(context, into: &subsequentRequestHeaders, using: DictionaryInjector())
 
-        XCTAssertEqual(subsequentRequestHeaders, [
-            "Accept": "application/json",
-            FirstFakeTracer.headerName: FirstFakeTracer.defaultTraceID,
-            SecondFakeTracer.headerName: SecondFakeTracer.defaultTraceID,
-        ])
+        XCTAssertEqual(
+            subsequentRequestHeaders,
+            [
+                "Accept": "application/json",
+                FirstFakeTracer.headerName: FirstFakeTracer.defaultTraceID,
+                SecondFakeTracer.headerName: SecondFakeTracer.defaultTraceID,
+            ]
+        )
     }
 }
 
@@ -63,16 +66,15 @@ private final class FirstFakeTracer: Instrument {
     static let defaultTraceID = UUID().uuidString
 
     func inject<Carrier, Inject>(_ context: ServiceContext, into carrier: inout Carrier, using injector: Inject)
-        where Inject: Injector, Carrier == Inject.Carrier
-    {
+    where Inject: Injector, Carrier == Inject.Carrier {
         guard let traceID = context[TraceIDKey.self] else { return }
         injector.inject(traceID, forKey: FirstFakeTracer.headerName, into: &carrier)
     }
 
     func extract<Carrier, Extract>(_ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract)
-        where Extract: Extractor, Carrier == Extract.Carrier
-    {
-        let traceID = extractor.extract(key: FirstFakeTracer.headerName, from: carrier) ?? FirstFakeTracer.defaultTraceID
+    where Extract: Extractor, Carrier == Extract.Carrier {
+        let traceID =
+            extractor.extract(key: FirstFakeTracer.headerName, from: carrier) ?? FirstFakeTracer.defaultTraceID
         context[TraceIDKey.self] = traceID
     }
 }
@@ -88,9 +90,11 @@ private final class SecondFakeTracer: Instrument {
     static let defaultTraceID = UUID().uuidString
 
     func inject<Carrier, Inject>(
-        _ context: ServiceContext, into carrier: inout Carrier, using injector: Inject
+        _ context: ServiceContext,
+        into carrier: inout Carrier,
+        using injector: Inject
     )
-        where
+    where
         Inject: Injector,
         Carrier == Inject.Carrier
     {
@@ -99,13 +103,16 @@ private final class SecondFakeTracer: Instrument {
     }
 
     func extract<Carrier, Extract>(
-        _ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract
+        _ carrier: Carrier,
+        into context: inout ServiceContext,
+        using extractor: Extract
     )
-        where
+    where
         Extract: Extractor,
         Carrier == Extract.Carrier
     {
-        let traceID = extractor.extract(key: SecondFakeTracer.headerName, from: carrier) ?? SecondFakeTracer.defaultTraceID
+        let traceID =
+            extractor.extract(key: SecondFakeTracer.headerName, from: carrier) ?? SecondFakeTracer.defaultTraceID
         context[TraceIDKey.self] = traceID
     }
 }
diff --git a/Tests/InstrumentationTests/InstrumentationSystemTests.swift b/Tests/InstrumentationTests/InstrumentationSystemTests.swift
index 5955ad2..c614e4f 100644
--- a/Tests/InstrumentationTests/InstrumentationSystemTests.swift
+++ b/Tests/InstrumentationTests/InstrumentationSystemTests.swift
@@ -2,20 +2,21 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Instrumentation
 import ServiceContextModule
 import XCTest
 
+@testable import Instrumentation
+
 extension InstrumentationSystem {
     public static func _instrument<I>(of instrumentType: I.Type) -> I? where I: Instrument {
         self._findInstrument(where: { $0 is I }) as? I
@@ -54,18 +55,20 @@ private final class FakeTracer: Instrument {
         into carrier: inout Carrier,
         using injector: Inject
     )
-        where
+    where
         Inject: Injector,
-        Carrier == Inject.Carrier {}
+        Carrier == Inject.Carrier
+    {}
 
     func extract<Carrier, Extract>(
         _ carrier: Carrier,
         into context: inout ServiceContext,
         using extractor: Extract
     )
-        where
+    where
         Extract: Extractor,
-        Carrier == Extract.Carrier {}
+        Carrier == Extract.Carrier
+    {}
 }
 
 private final class FakeInstrument: Instrument {
@@ -74,16 +77,18 @@ private final class FakeInstrument: Instrument {
         into carrier: inout Carrier,
         using injector: Inject
     )
-        where
+    where
         Inject: Injector,
-        Carrier == Inject.Carrier {}
+        Carrier == Inject.Carrier
+    {}
 
     func extract<Carrier, Extract>(
         _ carrier: Carrier,
         into context: inout ServiceContext,
         using extractor: Extract
     )
-        where
+    where
         Extract: Extractor,
-        Carrier == Extract.Carrier {}
+        Carrier == Extract.Carrier
+    {}
 }
diff --git a/Tests/TracingTests/ActorTracingTests.swift b/Tests/TracingTests/ActorTracingTests.swift
index 87bd4ce..784a489 100644
--- a/Tests/TracingTests/ActorTracingTests.swift
+++ b/Tests/TracingTests/ActorTracingTests.swift
@@ -2,21 +2,22 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Instrumentation
 import ServiceContextModule
 import Tracing
 import XCTest
 
+@testable import Instrumentation
+
 final class ActorTracingTests: XCTestCase {
     override class func tearDown() {
         super.tearDown()
diff --git a/Tests/TracingTests/DynamicTracepointTracerTests.swift b/Tests/TracingTests/DynamicTracepointTracerTests.swift
index 82d5ec9..aa41f42 100644
--- a/Tests/TracingTests/DynamicTracepointTracerTests.swift
+++ b/Tests/TracingTests/DynamicTracepointTracerTests.swift
@@ -2,21 +2,22 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Instrumentation
 import ServiceContextModule
 import Tracing
 import XCTest
 
+@testable import Instrumentation
+
 final class DynamicTracepointTracerTests: XCTestCase {
     override class func tearDown() {
         super.tearDown()
@@ -32,7 +33,7 @@ final class DynamicTracepointTracerTests: XCTestCase {
         }
 
         let fileID = #fileID
-        let fakeLine: UInt = 77 // trick number, see withSpan below.
+        let fakeLine: UInt = 77  // trick number, see withSpan below.
         let fakeNextLine: UInt = fakeLine + 11
         tracer.enableTracepoint(fileID: fileID, line: fakeLine)
         // Imagine this is set via some "ops command", e.g. `<control> <pid, or ssh or something> trace enable Sample.swift:1234`
@@ -120,19 +121,19 @@ final class DynamicTracepointTestTracer: LegacyTracer {
             var match = true
             if let fun = self.function {
                 match = match && fun == tracepoint.function
-                if !match { // short-circuit further checks
+                if !match {  // short-circuit further checks
                     return false
                 }
             }
             if let fid = self.fileID {
                 match = match && fid == tracepoint.fileID
-                if !match { // short-circuit further checks
+                if !match {  // short-circuit further checks
                     return false
                 }
             }
             if let l = self.line {
                 match = match && l == tracepoint.line
-                if !match { // short-circuit further checks
+                if !match {  // short-circuit further checks
                     return false
                 }
             }
@@ -218,12 +219,14 @@ final class DynamicTracepointTestTracer: LegacyTracer {
 
     func forceFlush() {}
 
-    func extract<Carrier, Extract>(_ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract) where Extract: Extractor, Extract.Carrier == Carrier {
+    func extract<Carrier, Extract>(_ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract)
+    where Extract: Extractor, Extract.Carrier == Carrier {
         let traceID = extractor.extract(key: "trace-id", from: carrier) ?? UUID().uuidString
         context.traceID = traceID
     }
 
-    func inject<Carrier, Inject>(_ context: ServiceContext, into carrier: inout Carrier, using injector: Inject) where Inject: Injector, Inject.Carrier == Carrier {
+    func inject<Carrier, Inject>(_ context: ServiceContext, into carrier: inout Carrier, using injector: Inject)
+    where Inject: Injector, Inject.Carrier == Carrier {
         guard let traceID = context.traceID else {
             return
         }
@@ -295,7 +298,11 @@ extension DynamicTracepointTestTracer {
             // nothing
         }
 
-        func recordError<Instant: TracerInstant>(_ error: Error, attributes: SpanAttributes, at instant: @autoclosure () -> Instant) {
+        func recordError<Instant: TracerInstant>(
+            _ error: Error,
+            attributes: SpanAttributes,
+            at instant: @autoclosure () -> Instant
+        ) {
             print("")
         }
 
@@ -310,7 +317,6 @@ extension DynamicTracepointTestTracer {
     }
 }
 
-#if compiler(>=5.7.0)
 extension DynamicTracepointTestTracer: Tracer {
     typealias Span = TracepointSpan
 
@@ -341,7 +347,8 @@ extension DynamicTracepointTestTracer: Tracer {
         return span
     }
 }
-#endif
 
-extension DynamicTracepointTestTracer: @unchecked Sendable {} // only intended for single threaded testing
-extension DynamicTracepointTestTracer.TracepointSpan: @unchecked Sendable {} // only intended for single threaded testing
+// only intended for single threaded testing
+extension DynamicTracepointTestTracer: @unchecked Sendable {}
+// only intended for single threaded testing
+extension DynamicTracepointTestTracer.TracepointSpan: @unchecked Sendable {}
diff --git a/Tests/TracingTests/SpanTests.swift b/Tests/TracingTests/SpanTests.swift
index 9a52f96..68fb2de 100644
--- a/Tests/TracingTests/SpanTests.swift
+++ b/Tests/TracingTests/SpanTests.swift
@@ -2,21 +2,22 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Instrumentation
 import ServiceContextModule
 import Tracing
 import XCTest
 
+@testable import Instrumentation
+
 final class SpanTests: XCTestCase {
     func testSpanEventIsExpressibleByStringLiteral() {
         let event: SpanEvent = "test"
@@ -118,8 +119,7 @@ final class SpanTests: XCTestCase {
         XCTAssertEqual(attributes["meaning.of.life"]?.toSpanAttribute(), SpanAttribute.int(42))
         XCTAssertEqual(attributes["alive"]?.toSpanAttribute(), SpanAttribute.bool(false))
 
-        // An import like: `import TracingOpenTelemetrySupport` can enable type-safe well defined attributes,
-        // e.g. as defined in https://github.com/open-telemetry/opentelemetry-specification/tree/master/specification/trace/semantic_conventions
+        // An import like: `import TracingOpenTelemetrySupport` can enable type-safe well defined attributes
         attributes.name = "kappa"
         attributes.sampleHttp.statusCode = 200
         attributes.sampleHttp.codesArray = [1, 2, 3]
@@ -137,7 +137,10 @@ final class SpanTests: XCTestCase {
         // normally we can use just the span attribute values, and it is not type safe or guided in any way:
         attributes.sampleHttp.customType = CustomAttributeValue()
 
-        XCTAssertEqual(attributes["http.custom_value"]?.toSpanAttribute(), SpanAttribute.stringConvertible(CustomAttributeValue()))
+        XCTAssertEqual(
+            attributes["http.custom_value"]?.toSpanAttribute(),
+            SpanAttribute.stringConvertible(CustomAttributeValue())
+        )
         XCTAssertEqual(String(reflecting: attributes.sampleHttp.customType), "Optional(CustomAttributeValue())")
         XCTAssertEqual(attributes.sampleHttp.customType, CustomAttributeValue())
     }
@@ -150,11 +153,15 @@ final class SpanTests: XCTestCase {
         ]
 
         var dictionary = [String: SpanAttribute]()
+
+        // swift-format-ignore: ReplaceForEachWithForLoop
         attributes.forEach { name, attribute in
             dictionary[name] = attribute
         }
 
-        guard case .some(.int64) = dictionary["0"], case .some(.bool) = dictionary["1"], case .some(.string) = dictionary["2"] else {
+        guard case .some(.int64) = dictionary["0"], case .some(.bool) = dictionary["1"],
+            case .some(.string) = dictionary["2"]
+        else {
             XCTFail("Expected all attributes to be copied to the dictionary.")
             return
         }
@@ -207,7 +214,8 @@ final class SpanTests: XCTestCase {
         XCTAssertEqual(child.links.count, 1)
         XCTAssertEqual(child.links[0].context[TestBaggageContextKey.self], "test")
         XCTAssertEqual(child.links[0].attributes.sampleHttp.statusCode, 418)
-        guard case .some(.int64(let statusCode)) = child.links[0].attributes["http.status_code"]?.toSpanAttribute() else {
+        guard case .some(.int64(let statusCode)) = child.links[0].attributes["http.status_code"]?.toSpanAttribute()
+        else {
             XCTFail("Expected int value for http.status_code")
             return
         }
@@ -241,7 +249,8 @@ final class SpanTests: XCTestCase {
         XCTAssertEqual(child.links.count, 1)
         XCTAssertEqual(child.links[0].context[TestBaggageContextKey.self], "test")
         XCTAssertEqual(child.links[0].attributes.sampleHttp.statusCode, 418)
-        guard case .some(.int32(let statusCode)) = child.links[0].attributes["http.status_code"]?.toSpanAttribute() else {
+        guard case .some(.int32(let statusCode)) = child.links[0].attributes["http.status_code"]?.toSpanAttribute()
+        else {
             XCTFail("Expected int value for http.status_code")
             return
         }
diff --git a/Tests/TracingTests/TestTracer.swift b/Tests/TracingTests/TestTracer.swift
index 7bb85fe..5930e3a 100644
--- a/Tests/TracingTests/TestTracer.swift
+++ b/Tests/TracingTests/TestTracer.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -46,7 +46,7 @@ final class TestTracer: LegacyTracer {
     public func forceFlush() {}
 
     func extract<Carrier, Extract>(_ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract)
-        where
+    where
         Extract: Extractor,
         Carrier == Extract.Carrier
     {
@@ -55,7 +55,7 @@ final class TestTracer: LegacyTracer {
     }
 
     func inject<Carrier, Inject>(_ context: ServiceContext, into carrier: inout Carrier, using injector: Inject)
-        where
+    where
         Inject: Injector,
         Carrier == Inject.Carrier
     {
@@ -175,7 +175,11 @@ final class TestSpan: Span {
         self.events.append(event)
     }
 
-    func recordError<Instant: TracerInstant>(_ error: Error, attributes: SpanAttributes, at instant: @autoclosure () -> Instant) {
+    func recordError<Instant: TracerInstant>(
+        _ error: Error,
+        attributes: SpanAttributes,
+        at instant: @autoclosure () -> Instant
+    ) {
         self.recordedErrors.append((error, attributes))
     }
 
@@ -185,5 +189,5 @@ final class TestSpan: Span {
     }
 }
 
-extension TestTracer: @unchecked Sendable {} // only intended for single threaded testing
-extension TestSpan: @unchecked Sendable {} // only intended for single threaded testing
+extension TestTracer: @unchecked Sendable {}  // only intended for single threaded testing
+extension TestSpan: @unchecked Sendable {}  // only intended for single threaded testing
diff --git a/Tests/TracingTests/TracedLock.swift b/Tests/TracingTests/TracedLock.swift
index 6ea0733..dd8de96 100644
--- a/Tests/TracingTests/TracedLock.swift
+++ b/Tests/TracingTests/TracedLock.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/Tests/TracingTests/TracedLockTests.swift b/Tests/TracingTests/TracedLockTests.swift
index 8e4b2a9..339735c 100644
--- a/Tests/TracingTests/TracedLockTests.swift
+++ b/Tests/TracingTests/TracedLockTests.swift
@@ -2,21 +2,22 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Instrumentation
 import ServiceContextModule
 import Tracing
 import XCTest
 
+@testable import Instrumentation
+
 final class TracedLockTests: XCTestCase {
     override class func tearDown() {
         super.tearDown()
@@ -84,18 +85,20 @@ private final class TracedLockPrintlnTracer: LegacyTracer {
         into carrier: inout Carrier,
         using injector: Inject
     )
-        where
+    where
         Inject: Injector,
-        Carrier == Inject.Carrier {}
+        Carrier == Inject.Carrier
+    {}
 
     func extract<Carrier, Extract>(
         _ carrier: Carrier,
         into context: inout ServiceContext,
         using extractor: Extract
     )
-        where
+    where
         Extract: Extractor,
-        Carrier == Extract.Carrier {}
+        Carrier == Extract.Carrier
+    {}
 
     final class TracedLockPrintlnSpan: Tracing.Span {
         private let kind: SpanKind
@@ -135,7 +138,9 @@ private final class TracedLockPrintlnTracer: LegacyTracer {
             self.context = context
             self.kind = kind
 
-            print("  span [\(self.operationName): \(self.context[TaskIDKey.self] ?? "no-name")] @ \(self.startTimeMillis): start")
+            print(
+                "  span [\(self.operationName): \(self.context[TaskIDKey.self] ?? "no-name")] @ \(self.startTimeMillis): start"
+            )
         }
 
         func setStatus(_ status: SpanStatus) {
@@ -151,7 +156,11 @@ private final class TracedLockPrintlnTracer: LegacyTracer {
             self.events.append(event)
         }
 
-        func recordError<Instant: TracerInstant>(_ error: Error, attributes: SpanAttributes, at instant: @autoclosure () -> Instant) {}
+        func recordError<Instant: TracerInstant>(
+            _ error: Error,
+            attributes: SpanAttributes,
+            at instant: @autoclosure () -> Instant
+        ) {}
 
         func end<Instant: TracerInstant>(at instant: @autoclosure () -> Instant) {
             let time = instant()
@@ -181,4 +190,6 @@ extension TracedLockPrintlnTracer: Tracer {
 }
 
 extension TracedLockPrintlnTracer: Sendable {}
-extension TracedLockPrintlnTracer.TracedLockPrintlnSpan: @unchecked Sendable {} // only intended for single threaded testing
+
+// only intended for single threaded testing
+extension TracedLockPrintlnTracer.TracedLockPrintlnSpan: @unchecked Sendable {}
diff --git a/Tests/TracingTests/TracerTests+swift57.swift b/Tests/TracingTests/TracerTests+swift57.swift
index 55bd474..0d2e622 100644
--- a/Tests/TracingTests/TracerTests+swift57.swift
+++ b/Tests/TracingTests/TracerTests+swift57.swift
@@ -2,11 +2,11 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -46,13 +46,13 @@ final class SampleSwift57Tracer: Tracer {
     public func forceFlush() {}
 
     func extract<Carrier, Extract>(_ carrier: Carrier, into context: inout ServiceContext, using extractor: Extract)
-        where
+    where
         Extract: Extractor,
         Carrier == Extract.Carrier
     {}
 
     func inject<Carrier, Inject>(_ context: ServiceContext, into carrier: inout Carrier, using injector: Inject)
-        where
+    where
         Inject: Injector,
         Carrier == Inject.Carrier
     {}
@@ -117,7 +117,11 @@ final class SampleSwift57Span: Span {
         self.events.append(event)
     }
 
-    func recordError<Instant: TracerInstant>(_ error: Error, attributes: SpanAttributes, at instant: @autoclosure () -> Instant) {
+    func recordError<Instant: TracerInstant>(
+        _ error: Error,
+        attributes: SpanAttributes,
+        at instant: @autoclosure () -> Instant
+    ) {
         self.recordedErrors.append((error, attributes))
     }
 
@@ -127,5 +131,5 @@ final class SampleSwift57Span: Span {
     }
 }
 
-extension SampleSwift57Tracer: @unchecked Sendable {} // only intended for single threaded SampleSwift57ing
-extension SampleSwift57Span: @unchecked Sendable {} // only intended for single threaded SampleSwift57ing
+extension SampleSwift57Tracer: @unchecked Sendable {}  // only intended for single threaded SampleSwift57ing
+extension SampleSwift57Span: @unchecked Sendable {}  // only intended for single threaded SampleSwift57ing
diff --git a/Tests/TracingTests/TracerTests.swift b/Tests/TracingTests/TracerTests.swift
index 5939baa..705cf4d 100644
--- a/Tests/TracingTests/TracerTests.swift
+++ b/Tests/TracingTests/TracerTests.swift
@@ -2,20 +2,22 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
-@testable @_spi(Locking) import Instrumentation
 import ServiceContextModule
 import Tracing
 import XCTest
+
+@testable @_spi(Locking) import Instrumentation
+
 #if os(Linux)
 @preconcurrency import Dispatch
 #endif
@@ -216,7 +218,8 @@ final class TracerTests: XCTestCase {
         self.testAsync {
             var fromNonAsyncWorld = ServiceContext.topLevel
             fromNonAsyncWorld.traceID = "1234-5678"
-            let value = await tracer.withAnySpan("hello", context: fromNonAsyncWorld) { (span: any Tracing.Span) -> String in
+            let value = await tracer.withAnySpan("hello", context: fromNonAsyncWorld) {
+                (span: any Tracing.Span) -> String in
                 XCTAssertEqual(span.context.traceID, ServiceContext.current?.traceID)
                 XCTAssertEqual(span.context.traceID, fromNonAsyncWorld.traceID)
                 return await operation(span)
@@ -377,7 +380,7 @@ final class TracerTests: XCTestCase {
         XCTAssertEqual(span.startTimestampNanosSinceEpoch, instant.nanosecondsSinceEpoch)
     }
 
-//    @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
+    //    @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
     /// Helper method to execute async operations until we can use async tests (currently incompatible with the generated LinuxMain file).
     /// - Parameter operation: The operation to test.
     func testAsync(_ operation: @Sendable @escaping () async throws -> Void) rethrows {
diff --git a/Tests/TracingTests/TracerTimeTests.swift b/Tests/TracingTests/TracerTimeTests.swift
index da54249..40bca84 100644
--- a/Tests/TracingTests/TracerTimeTests.swift
+++ b/Tests/TracingTests/TracerTimeTests.swift
@@ -2,21 +2,23 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
-import struct Foundation.Date
-@testable import Instrumentation
 import Tracing
 import XCTest
 
+import struct Foundation.Date
+
+@testable import Instrumentation
+
 final class TracerTimeTests: XCTestCase {
     override class func tearDown() {
         super.tearDown()
@@ -27,8 +29,8 @@ final class TracerTimeTests: XCTestCase {
         let t = DefaultTracerClock.now
         let d = Date()
         XCTAssertEqual(
-            Double(t.millisecondsSinceEpoch) / 1000, // seconds
-            d.timeIntervalSince1970, // seconds
+            Double(t.millisecondsSinceEpoch) / 1000,  // seconds
+            d.timeIntervalSince1970,  // seconds
             accuracy: 10
         )
     }
diff --git a/Tests/TracingTests/TracingInstrumentationSystemTests.swift b/Tests/TracingTests/TracingInstrumentationSystemTests.swift
index dd32a04..fb656a3 100644
--- a/Tests/TracingTests/TracingInstrumentationSystemTests.swift
+++ b/Tests/TracingTests/TracingInstrumentationSystemTests.swift
@@ -2,20 +2,21 @@
 //
 // This source file is part of the Swift Distributed Tracing open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-// authors
+// Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Distributed Tracing project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Instrumentation
 import Tracing
 import XCTest
 
+@testable import Instrumentation
+
 extension InstrumentationSystem {
     public static func _legacyTracer<T>(of tracerType: T.Type) -> T? where T: LegacyTracer {
         self._findInstrument(where: { $0 is T }) as? T
diff --git a/scripts/docs/preview_docc.sh b/scripts/docs/preview_docc.sh
deleted file mode 100755
index 289203f..0000000
--- a/scripts/docs/preview_docc.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2023 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Actors open source project
-##
-## Copyright (c) 2018-2019 Apple Inc. and the Swift Distributed Actors project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.md for the list of Swift Distributed Actors project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-xcrun swift package --disable-sandbox preview-documentation --target Tracing
diff --git a/scripts/soundness.sh b/scripts/soundness.sh
deleted file mode 100755
index 73cb962..0000000
--- a/scripts/soundness.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-set -eu
-here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-bash $here/validate_license_headers.sh
-bash $here/validate_language.sh
-bash $here/validate_format.sh
diff --git a/scripts/validate_format.sh b/scripts/validate_format.sh
deleted file mode 100755
index 3f62388..0000000
--- a/scripts/validate_format.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-set -u
-
-# verify that swiftformat is on the PATH
-command -v swiftformat >/dev/null 2>&1 || { echo >&2 "'swiftformat' could not be found. Please ensure it is installed and on the PATH."; exit 1; }
-
-printf "=> Checking format\n"
-FIRST_OUT="$(git status --porcelain)"
-# swiftformat does not scale so we loop ourselves
-shopt -u dotglob
-find Sources/* Tests/* IntegrationTests/* -type d | while IFS= read -r d; do
-  printf "   * checking $d... "
-  out=$(swiftformat $d 2>&1)
-  SECOND_OUT="$(git status --porcelain)"
-  if [[ "$out" == *"error"*] && ["$out" != "*No eligible files" ]]; then
-    printf "\033[0;31merror!\033[0m\n"
-    echo $out
-    exit 1
-  fi
-  if [[ "$FIRST_OUT" != "$SECOND_OUT" ]]; then
-    printf "\033[0;31mformatting issues!\033[0m\n"
-    git --no-pager diff
-    exit 1
-  fi
-  printf "\033[0;32mokay.\033[0m\n"
-done
diff --git a/scripts/validate_language.sh b/scripts/validate_language.sh
deleted file mode 100755
index b925745..0000000
--- a/scripts/validate_language.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2021 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-set -eu
-
-printf "=> Checking for unacceptable language... "
-# This greps for unacceptable terminology. The square bracket[s] are so that
-# "git grep" doesn't find the lines that greps :).
-unacceptable_terms=(
-    -e blacklis[t]
-    -e whitelis[t]
-    -e slav[e]
-    -e sanit[y]
-)
-if git grep --color=never -i "${unacceptable_terms[@]}" > /dev/null; then
-    printf "\033[0;31mUnacceptable language found.\033[0m\n"
-    git grep -i "${unacceptable_terms[@]}"
-    exit 1
-fi
-printf "\033[0;32mokay.\033[0m\n"
diff --git a/scripts/validate_license_headers.sh b/scripts/validate_license_headers.sh
deleted file mode 100755
index a48401e..0000000
--- a/scripts/validate_license_headers.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) 2020-2022 Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the SwiftNIO open source project
-##
-## Copyright (c) 2017-2019 Apple Inc. and the SwiftNIO project authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-
-set -eu
-here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-function replace_acceptable_years() {
-  # this needs to replace all acceptable forms with 'YEARS'
-  sed -e 's/202[01]-202[123]/YEARS/' -e 's/202[0123]/YEARS/'
-}
-
-printf "=> Checking license headers\n"
-tmp=$(mktemp /tmp/.swift-context-context-soundness_XXXXXX)
-
-for language in swift-or-c bash dtrace; do
-  printf "   * $language... "
-  declare -a matching_files
-  declare -a exceptions
-  expections=( )
-  matching_files=( -name '*' )
-  case "$language" in
-      swift-or-c)
-        exceptions=( -name Package.swift -o -name 'Package@*.swift' )
-        matching_files=( -name '*.swift' -o -name '*.c' -o -name '*.h' )
-        cat > "$tmp" <<"EOF"
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift Distributed Tracing open source project
-//
-// Copyright (c) YEARS Apple Inc. and the Swift Distributed Tracing project
-// authors
-// Licensed under Apache License v2.0
-//
-// See LICENSE.txt for license information
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-//===----------------------------------------------------------------------===//
-EOF
-        ;;
-      bash)
-        matching_files=( -name '*.sh' )
-        cat > "$tmp" <<"EOF"
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is part of the Swift Distributed Tracing open source project
-##
-## Copyright (c) YEARS Apple Inc. and the Swift Distributed Tracing project
-## authors
-## Licensed under Apache License v2.0
-##
-## See LICENSE.txt for license information
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-##===----------------------------------------------------------------------===##
-EOF
-      ;;
-      dtrace)
-        matching_files=( -name '*.d' )
-        cat > "$tmp" <<"EOF"
-#!/usr/sbin/dtrace -q -s
-/*===----------------------------------------------------------------------===*
- *
- *  This source file is part of the Swift Distributed Tracing open source project
- *
- *  Copyright (c) YEARS Apple Inc. and the Swift Distributed Tracing project
- *  authors
- *  Licensed under Apache License v2.0
- *
- *  See LICENSE.txt for license information
- *
- *  SPDX-License-Identifier: Apache-2.0
- *
- *===----------------------------------------------------------------------===*/
-EOF
-      ;;
-    *)
-      echo >&2 "ERROR: unknown language '$language'"
-      ;;
-  esac
-
-  expected_lines=$(cat "$tmp" | wc -l)
-  expected_sha=$(cat "$tmp" | shasum)
-
-  (
-    cd "$here/.."
-    find . \
-      \( \! -path './.build/*' \) -a \
-      \( "${matching_files[@]}" \) -a \
-      \( \! \( "${exceptions[@]}" \) \) | while read line; do
-      if [[ "$(cat "$line" | replace_acceptable_years | head -n $expected_lines | shasum)" != "$expected_sha" ]]; then
-        printf "\033[0;31mmissing headers in file '$line'!\033[0m\n"
-        diff -u <(cat "$line" | replace_acceptable_years | head -n $expected_lines) "$tmp"
-        exit 1
-      fi
-    done
-    printf "\033[0;32mokay.\033[0m\n"
-  )
-done
-
-rm "$tmp"