diff --git a/Justfile b/Justfile index 511ae58..da0c76a 100644 --- a/Justfile +++ b/Justfile @@ -57,5 +57,5 @@ test: @cd go && go test ./... # Test: Integration tests - # TODO: Until this issue is taken care of, these will continue to fail: https://github.com/calebschoepp/opentelemetry-wasi/issues/45 + # TODO: Until this issue is taken care of, these will continue to fail: https://github.com/bytecodealliance/opentelemetry-wasi/issues/45 # @cargo test --manifest-path integration_tests/Cargo.toml diff --git a/README.md b/README.md index 6d1c84e..1b16ff6 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ # opentelemetry-wasi -Libraries to enable using OpenTelemetry within WebAssembly components backed by [WASI OTel](https://github.com/calebschoepp/wasi-otel). +Libraries to enable using OpenTelemetry within WebAssembly components backed by [WASI OTel](https://github.com/WebAssembly/wasi-otel). ## Questions? diff --git a/go/componentize-go.toml b/componentize-go.toml similarity index 85% rename from go/componentize-go.toml rename to componentize-go.toml index 91f8800..83f734e 100644 --- a/go/componentize-go.toml +++ b/componentize-go.toml @@ -1,4 +1,4 @@ # Use this world by default if none is specified: worlds = [ "wasi:otel/imports@0.2.0-rc.2" ] # Here's where to find the WIT files used by this SDK: -wit_paths = [ "../wit" ] +wit_paths = [ "wit" ] diff --git a/go/go.mod b/go.mod similarity index 89% rename from go/go.mod rename to go.mod index 103897e..a139c6a 100644 --- a/go/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/calebschoepp/opentelemetry-wasi +module github.com/bytecodealliance/opentelemetry-wasi go 1.25.5 @@ -15,7 +15,7 @@ require ( require ( github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13 // indirect - github.com/bytecodealliance/componentize-go v0.3.1 // indirect + github.com/bytecodealliance/componentize-go v0.3.2 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.3 // indirect diff --git a/go/go.sum b/go.sum similarity index 96% rename from go/go.sum rename to go.sum index f974499..98e1097 100644 --- a/go/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13 h1:JtuelWqyixKApmXm3qghhZ7O96P6NKpyrlSIe8Rwnhw= github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod h1:7kfpUbyCdGJ9fDRCp3fopPQi5+cKNHgTE4ZuNrO71Cw= -github.com/bytecodealliance/componentize-go v0.3.1 h1:uXfSgjvIhYun74gcxnOxAO3pUKQ4SWmStxlROZLUoRA= -github.com/bytecodealliance/componentize-go v0.3.1/go.mod h1:w1QFtPLGI9o38epvMOPyCKbMc7q7GJ7yZhIvhGTpzA0= +github.com/bytecodealliance/componentize-go v0.3.2 h1:XwIx+yruG0WnlmKexpjIzWZg7WzF+N75MsvttkuwEgk= +github.com/bytecodealliance/componentize-go v0.3.2/go.mod h1:w1QFtPLGI9o38epvMOPyCKbMc7q7GJ7yZhIvhGTpzA0= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/go/README.md b/go/README.md index fe3dd70..bcca9d1 100644 --- a/go/README.md +++ b/go/README.md @@ -4,10 +4,8 @@ ### Prerequisites -- [**go**](https://go.dev/dl/) - v1.25+ -- [**componentize-go**](https://github.com/bytecodealliance/componentize-go) - v0.2.0 -- [**Rust toolchain**](https://rust-lang.org/) - Latest version -- [**Spin**](https://github.com/spinframework/spin) - v3.6.1 +- [**go**](https://go.dev/dl/) - v1.25 +- [**Spin**](https://github.com/spinframework/spin) - v4.0.0 ### Run an Example Application @@ -33,10 +31,10 @@ Whenever WIT files are changed/added to the `../wit` directory, the bindings in ### Prerequisites -- [**go**](https://go.dev/dl/) - v1.25+ +- [**go**](https://go.dev/dl/) - v1.25 ### Run ```sh -go tool componentize-go -w imports -d ../wit bindings -o internal --pkg-name github.com/calebschoepp/opentelemetry-wasi/internal --format +go tool componentize-go -w imports -d ../wit bindings -o internal --pkg-name github.com/bytecodealliance/opentelemetry-wasi/go/internal --format ``` diff --git a/go/examples/spin-basic/go.mod b/go/examples/spin-basic/go.mod index 801fc07..595b90e 100644 --- a/go/examples/spin-basic/go.mod +++ b/go/examples/spin-basic/go.mod @@ -1,9 +1,9 @@ -module github.com/calebschoepp/opentelemetry-wasi/examples/spin-basic +module github.com/bytecodealliance/opentelemetry-wasi/go/examples/spin-basic go 1.25.5 require ( - github.com/calebschoepp/opentelemetry-wasi v0.0.0-00010101000000-000000000000 + github.com/bytecodealliance/opentelemetry-wasi v0.0.0 github.com/spinframework/spin-go-sdk/v3 v3.0.0-20260407161511-f2bf8873711b go.opentelemetry.io/otel v1.39.0 go.opentelemetry.io/otel/log v0.14.0 @@ -15,7 +15,7 @@ require ( require ( github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13 // indirect - github.com/bytecodealliance/componentize-go v0.3.1 // indirect + github.com/bytecodealliance/componentize-go v0.3.2 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -27,6 +27,6 @@ require ( golang.org/x/sys v0.39.0 // indirect ) -replace github.com/calebschoepp/opentelemetry-wasi => ../../ +replace github.com/bytecodealliance/opentelemetry-wasi => ../../../ tool github.com/bytecodealliance/componentize-go diff --git a/go/examples/spin-basic/go.sum b/go/examples/spin-basic/go.sum index f760043..bd34a3a 100644 --- a/go/examples/spin-basic/go.sum +++ b/go/examples/spin-basic/go.sum @@ -1,7 +1,7 @@ github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13 h1:JtuelWqyixKApmXm3qghhZ7O96P6NKpyrlSIe8Rwnhw= github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod h1:7kfpUbyCdGJ9fDRCp3fopPQi5+cKNHgTE4ZuNrO71Cw= -github.com/bytecodealliance/componentize-go v0.3.1 h1:uXfSgjvIhYun74gcxnOxAO3pUKQ4SWmStxlROZLUoRA= -github.com/bytecodealliance/componentize-go v0.3.1/go.mod h1:w1QFtPLGI9o38epvMOPyCKbMc7q7GJ7yZhIvhGTpzA0= +github.com/bytecodealliance/componentize-go v0.3.2 h1:XwIx+yruG0WnlmKexpjIzWZg7WzF+N75MsvttkuwEgk= +github.com/bytecodealliance/componentize-go v0.3.2/go.mod h1:w1QFtPLGI9o38epvMOPyCKbMc7q7GJ7yZhIvhGTpzA0= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/go/examples/spin-basic/main.go b/go/examples/spin-basic/main.go index 99d3b3d..3b6702a 100644 --- a/go/examples/spin-basic/main.go +++ b/go/examples/spin-basic/main.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - wasiLogs "github.com/calebschoepp/opentelemetry-wasi/logs" - wasiMetrics "github.com/calebschoepp/opentelemetry-wasi/metrics" - wasiTracing "github.com/calebschoepp/opentelemetry-wasi/tracing" + wasiLogs "github.com/bytecodealliance/opentelemetry-wasi/go/logs" + wasiMetrics "github.com/bytecodealliance/opentelemetry-wasi/go/metrics" + wasiTracing "github.com/bytecodealliance/opentelemetry-wasi/go/tracing" spinhttp "github.com/spinframework/spin-go-sdk/v3/http" "github.com/spinframework/spin-go-sdk/v3/kv" "go.opentelemetry.io/otel" diff --git a/go/internal/wasi_clocks_monotonic_clock/wit_bindings.go b/go/internal/wasi_clocks_monotonic_clock/wit_bindings.go index 8a72ab7..e3a5e54 100644 --- a/go/internal/wasi_clocks_monotonic_clock/wit_bindings.go +++ b/go/internal/wasi_clocks_monotonic_clock/wit_bindings.go @@ -8,7 +8,7 @@ package wasi_clocks_monotonic_clock import ( - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_io_poll" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_io_poll" ) type Pollable = wasi_io_poll.Pollable diff --git a/go/internal/wasi_otel_logs/wit_bindings.go b/go/internal/wasi_otel_logs/wit_bindings.go index 74e242c..719dd61 100644 --- a/go/internal/wasi_otel_logs/wit_bindings.go +++ b/go/internal/wasi_otel_logs/wit_bindings.go @@ -8,9 +8,9 @@ package wasi_otel_logs import ( - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_clocks_wall_clock" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_tracing" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_types" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_clocks_wall_clock" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_tracing" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_types" witRuntime "go.bytecodealliance.org/pkg/wit/runtime" witTypes "go.bytecodealliance.org/pkg/wit/types" "runtime" diff --git a/go/internal/wasi_otel_metrics/wit_bindings.go b/go/internal/wasi_otel_metrics/wit_bindings.go index c8b2f9e..c9d7016 100644 --- a/go/internal/wasi_otel_metrics/wit_bindings.go +++ b/go/internal/wasi_otel_metrics/wit_bindings.go @@ -8,8 +8,8 @@ package wasi_otel_metrics import ( - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_clocks_wall_clock" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_types" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_clocks_wall_clock" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_types" witRuntime "go.bytecodealliance.org/pkg/wit/runtime" witTypes "go.bytecodealliance.org/pkg/wit/types" "runtime" diff --git a/go/internal/wasi_otel_tracing/wit_bindings.go b/go/internal/wasi_otel_tracing/wit_bindings.go index cebe416..a1234df 100644 --- a/go/internal/wasi_otel_tracing/wit_bindings.go +++ b/go/internal/wasi_otel_tracing/wit_bindings.go @@ -8,8 +8,8 @@ package wasi_otel_tracing import ( - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_clocks_wall_clock" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_types" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_clocks_wall_clock" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_types" witRuntime "go.bytecodealliance.org/pkg/wit/runtime" witTypes "go.bytecodealliance.org/pkg/wit/types" "runtime" diff --git a/go/logs/conversions.go b/go/logs/conversions.go index 8b3c646..da0f925 100644 --- a/go/logs/conversions.go +++ b/go/logs/conversions.go @@ -5,11 +5,11 @@ import ( "encoding/json" "fmt" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_clocks_wall_clock" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_logs" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_tracing" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_types" - "github.com/calebschoepp/opentelemetry-wasi/types" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_clocks_wall_clock" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_logs" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_tracing" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_types" + "github.com/bytecodealliance/opentelemetry-wasi/go/types" witTypes "go.bytecodealliance.org/pkg/wit/types" logApi "go.opentelemetry.io/otel/log" "go.opentelemetry.io/otel/sdk/log" diff --git a/go/logs/conversions_test.go b/go/logs/conversions_test.go index 6ab30f4..e5cd838 100644 --- a/go/logs/conversions_test.go +++ b/go/logs/conversions_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/calebschoepp/opentelemetry-wasi/logs" + "github.com/bytecodealliance/opentelemetry-wasi/go/logs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" logApi "go.opentelemetry.io/otel/log" diff --git a/go/logs/logs.go b/go/logs/logs.go index bb55313..fd96f7c 100644 --- a/go/logs/logs.go +++ b/go/logs/logs.go @@ -3,7 +3,7 @@ package logs import ( "context" - wasiLogs "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_logs" + wasiLogs "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_logs" "go.opentelemetry.io/otel/sdk/log" ) diff --git a/go/metrics/conversions.go b/go/metrics/conversions.go index 02d3fe5..e2a8bf2 100644 --- a/go/metrics/conversions.go +++ b/go/metrics/conversions.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "time" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_clocks_wall_clock" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_metrics" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_types" - "github.com/calebschoepp/opentelemetry-wasi/types" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_clocks_wall_clock" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_metrics" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_types" + "github.com/bytecodealliance/opentelemetry-wasi/go/types" witTypes "go.bytecodealliance.org/pkg/wit/types" "go.opentelemetry.io/otel/sdk/metric/metricdata" ) diff --git a/go/metrics/metrics.go b/go/metrics/metrics.go index 527ec85..fd81127 100644 --- a/go/metrics/metrics.go +++ b/go/metrics/metrics.go @@ -3,7 +3,7 @@ package metrics import ( "context" - wasiMetrics "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_metrics" + wasiMetrics "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" diff --git a/go/tracing/conversions.go b/go/tracing/conversions.go index 16a063b..53dfd24 100644 --- a/go/tracing/conversions.go +++ b/go/tracing/conversions.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_tracing" - "github.com/calebschoepp/opentelemetry-wasi/types" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_tracing" + "github.com/bytecodealliance/opentelemetry-wasi/go/types" witTypes "go.bytecodealliance.org/pkg/wit/types" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/sdk/trace" diff --git a/go/tracing/tracing.go b/go/tracing/tracing.go index d62b9f1..ef50c10 100644 --- a/go/tracing/tracing.go +++ b/go/tracing/tracing.go @@ -3,7 +3,7 @@ package tracing import ( "context" - wasiTrace "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_tracing" + wasiTrace "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_tracing" "go.opentelemetry.io/otel/sdk/trace" traceApi "go.opentelemetry.io/otel/trace" ) diff --git a/go/types/conversions.go b/go/types/conversions.go index 2570985..40dd69e 100644 --- a/go/types/conversions.go +++ b/go/types/conversions.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_clocks_wall_clock" - "github.com/calebschoepp/opentelemetry-wasi/internal/wasi_otel_types" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_clocks_wall_clock" + "github.com/bytecodealliance/opentelemetry-wasi/go/internal/wasi_otel_types" witTypes "go.bytecodealliance.org/pkg/wit/types" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/instrumentation" diff --git a/rust/README.md b/rust/README.md index e97b171..0079121 100644 --- a/rust/README.md +++ b/rust/README.md @@ -1,6 +1,6 @@ # OpenTelemetry WASI for Rust -Enables using OpenTelemetry within Rust WebAssembly components backed by [WASI OTel](https://github.com/calebschoepp/wasi-otel). +Enables using OpenTelemetry within Rust WebAssembly components backed by [WASI OTel](https://github.com/WebAssembly/wasi-otel). ## Usage diff --git a/ts/README.md b/ts/README.md index f81a46a..e932da4 100644 --- a/ts/README.md +++ b/ts/README.md @@ -1,6 +1,6 @@ # OpenTelemetry WASI for TypeScript -Enables using OpenTelemetry within TypeScript WebAssembly components backed by [WASI OTel](https://github.com/calebschoepp/wasi-otel). +Enables using OpenTelemetry within TypeScript WebAssembly components backed by [WASI OTel](https://github.com/WebAssembly/wasi-otel). ## Usage