Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</div>

# 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?

Expand Down
2 changes: 1 addition & 1 deletion go/componentize-go.toml → componentize-go.toml
Original file line number Diff line number Diff line change
@@ -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" ]
4 changes: 2 additions & 2 deletions go/go.mod → go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/calebschoepp/opentelemetry-wasi
module github.com/bytecodealliance/opentelemetry-wasi

go 1.25.5

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go/go.sum → go.sum
Original file line number Diff line number Diff line change
@@ -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=
Expand Down
10 changes: 4 additions & 6 deletions go/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
calebschoepp marked this conversation as resolved.
- [**Spin**](https://github.com/spinframework/spin) - v4.0.0

### Run an Example Application

Expand All @@ -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
```
8 changes: 4 additions & 4 deletions go/examples/spin-basic/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions go/examples/spin-basic/go.sum
Original file line number Diff line number Diff line change
@@ -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=
Expand Down
6 changes: 3 additions & 3 deletions go/examples/spin-basic/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/internal/wasi_clocks_monotonic_clock/wit_bindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions go/internal/wasi_otel_logs/wit_bindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions go/internal/wasi_otel_metrics/wit_bindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions go/internal/wasi_otel_tracing/wit_bindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions go/logs/conversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/logs/conversions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/logs/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions go/metrics/conversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go/metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions go/tracing/conversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/tracing/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions go/types/conversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rust/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion ts/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading