Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

separate verifier into a single module #149

Closed
wants to merge 7 commits into from
Closed
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 docs/how-to-write-tests-for-plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ there should be two spans in `test_executing_commands.go`, one represents for th
represents for the `get` redis operation. You should use the `verifier` to verify the correctness:

```go
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
import "github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"

verifier.WaitAndAssertTraces(func (stubs []tracetest.SpanStubs) {
verifier.VerifyDbAttributes(stubs[0][0], "set", "", "redis", "", "localhost", "set a b ex 5: ", "set")
Expand Down
5 changes: 4 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module github.com/alibaba/opentelemetry-go-auto-instrumentation

go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ./verifier

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
github.com/dave/dst v0.27.3
github.com/docker/go-connections v0.5.0
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
github.com/testcontainers/testcontainers-go v0.32.0
github.com/testcontainers/testcontainers-go/modules/mysql v0.32.0
go.opentelemetry.io/otel v1.30.0
Expand Down Expand Up @@ -44,6 +46,7 @@ require (
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"errors"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/core/meter"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/inst-api-semconv/instrumenter/http"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"go.opentelemetry.io/contrib/instrumentation/runtime"
"go.opentelemetry.io/otel"
_ "go.opentelemetry.io/otel"
Expand Down
4 changes: 2 additions & 2 deletions test/build/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ module build

go 1.22



replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../opentelemetry-go-auto-instrumentation

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../opentelemetry-go-auto-instrumentation/verifier

require (
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions test/build/proj1/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ require (
)

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier
2 changes: 2 additions & 0 deletions test/build/proj2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ require (
)

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier
4 changes: 3 additions & 1 deletion test/databasesql/mysql/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module databasesql/mysql

go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
github.com/go-sql-driver/mysql v1.8.1
go.opentelemetry.io/otel/sdk v1.30.0
)
Expand Down
2 changes: 1 addition & 1 deletion test/databasesql/mysql/test_access_database.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package main

import (
"database/sql"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
_ "github.com/go-sql-driver/mysql"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"log"
Expand Down
2 changes: 1 addition & 1 deletion test/databasesql/mysql/test_fetching_database.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"context"
"database/sql"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
_ "github.com/go-sql-driver/mysql"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"os"
Expand Down
2 changes: 1 addition & 1 deletion test/databasesql/mysql/test_modify_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"context"
"database/sql"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
_ "github.com/go-sql-driver/mysql"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"log"
Expand Down
2 changes: 1 addition & 1 deletion test/databasesql/mysql/test_prepared_statement.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"context"
"database/sql"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
_ "github.com/go-sql-driver/mysql"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"log"
Expand Down
2 changes: 1 addition & 1 deletion test/databasesql/mysql/test_single_row_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"database/sql"
"fmt"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
_ "github.com/go-sql-driver/mysql"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"log"
Expand Down
2 changes: 1 addition & 1 deletion test/databasesql/mysql/test_transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"context"
"database/sql"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
_ "github.com/go-sql-driver/mysql"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"log"
Expand Down
4 changes: 3 additions & 1 deletion test/echo/v4.0.0/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module echo

go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
github.com/labstack/echo/v4 v4.12.0
go.opentelemetry.io/otel/sdk v1.30.0
)
Expand Down
2 changes: 1 addition & 1 deletion test/echo/v4.0.0/test_echo_basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"net/http"
"time"

"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
echo "github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
Expand Down
2 changes: 1 addition & 1 deletion test/echo/v4.0.0/test_echo_pattern.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"net/http"
"time"

"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
echo "github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"

Expand Down
4 changes: 3 additions & 1 deletion test/echo/v4.10.0/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module echo

go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
github.com/labstack/echo/v4 v4.12.0
go.opentelemetry.io/otel/sdk v1.30.0
)
Expand Down
2 changes: 1 addition & 1 deletion test/echo/v4.10.0/test_echo_middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"net/http"
"time"

"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
Expand Down
2 changes: 2 additions & 0 deletions test/errors-test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ module errors-test
go 1.18

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../opentelemetry-go-auto-instrumentation

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../opentelemetry-go-auto-instrumentation/verifier
4 changes: 3 additions & 1 deletion test/fasthttp/v1.45.0/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ module fasthttp/v1.45.0

go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

require github.com/valyala/fasthttp v1.52.0

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/klauspost/compress v1.17.6 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion test/fasthttp/v1.45.0/test_basic_http.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package main

import (
"fmt"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"github.com/valyala/fasthttp"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"time"
Expand Down
2 changes: 1 addition & 1 deletion test/fasthttp/v1.45.0/test_basic_https.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package main

import (
"fmt"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"github.com/valyala/fasthttp"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"time"
Expand Down
2 changes: 2 additions & 0 deletions test/flags/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ module flags
go 1.18

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../opentelemetry-go-auto-instrumentation

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../opentelemetry-go-auto-instrumentation/verifier
2 changes: 1 addition & 1 deletion test/gin/gin.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"context"
"fmt"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"github.com/gin-gonic/gin"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"log"
Expand Down
4 changes: 3 additions & 1 deletion test/gin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module gin

go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../opentelemetry-go-auto-instrumentation

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
github.com/gin-gonic/gin v1.10.0
go.opentelemetry.io/otel/sdk v1.30.0
)
Expand Down
13 changes: 1 addition & 12 deletions test/golog/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,4 @@ go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../opentelemetry-go-auto-instrumentation

require github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000

require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/uuid v1.6.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
golang.org/x/sys v0.26.0 // indirect
)
replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../opentelemetry-go-auto-instrumentation/verifier
4 changes: 3 additions & 1 deletion test/gorm/v1.22.0/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module gorm/v1.22.0

go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
go.opentelemetry.io/otel/sdk v1.30.0
gorm.io/driver/mysql v1.1.3
gorm.io/gorm v1.22.0
Expand Down
2 changes: 1 addition & 1 deletion test/gorm/v1.22.0/test_gorm_crud.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"log"
"os"
Expand Down
4 changes: 3 additions & 1 deletion test/gorm/v1.23.1/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module gorm

go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
go.opentelemetry.io/otel/sdk v1.30.0
gorm.io/driver/mysql v1.3.1
gorm.io/gorm v1.23.1
Expand Down
2 changes: 1 addition & 1 deletion test/gorm/v1.23.1/test_gorm_crud.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"log"
"os"
Expand Down
4 changes: 3 additions & 1 deletion test/grpc/v1.44.0/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module grpc

go 1.22

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
go.opentelemetry.io/otel v1.30.0
go.opentelemetry.io/otel/sdk v1.30.0
google.golang.org/grpc v1.59.0
Expand Down
2 changes: 1 addition & 1 deletion test/grpc/v1.44.0/test_grpc_basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package main

import (
"context"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion test/grpc/v1.44.0/test_grpc_fail_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"context"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"time"
Expand Down
4 changes: 3 additions & 1 deletion test/grpc_stream/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ module grpc

go 1.22.7

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../opentelemetry-go-auto-instrumentation

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
go.opentelemetry.io/otel/sdk v1.30.0
google.golang.org/grpc v1.66.2
google.golang.org/grpc/examples v0.0.0-20240925225118-218811eb43b1
Expand Down
2 changes: 1 addition & 1 deletion test/grpc_stream/test_grpc_stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
"encoding/json"
"flag"
"fmt"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/verifier"
"github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"grpc/client"
"io"
Expand Down
2 changes: 2 additions & 0 deletions test/helloworld/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ go 1.18

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../opentelemetry-go-auto-instrumentation

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../opentelemetry-go-auto-instrumentation/verifier

require golang.org/x/time v0.5.0
4 changes: 3 additions & 1 deletion test/hertz/v0.9.0/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ go 1.22

toolchain go1.22.7

replace github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier => ../../../../opentelemetry-go-auto-instrumentation/verifier

replace github.com/alibaba/opentelemetry-go-auto-instrumentation => ../../../../opentelemetry-go-auto-instrumentation

require (
github.com/alibaba/opentelemetry-go-auto-instrumentation v0.0.0-00010101000000-000000000000
github.com/alibaba/opentelemetry-go-auto-instrumentation/verifier v0.0.0-00010101000000-000000000000
github.com/cloudwego/hertz v0.9.0
)

Expand Down
Loading
Loading