Skip to content

Commit 7bf0745

Browse files
committed
[FIX] fix ci
1 parent 9d7b1f5 commit 7bf0745

File tree

12 files changed

+21
-9
lines changed

12 files changed

+21
-9
lines changed

.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,12 @@ instrumentation/google.golang.org/grpc/otelgrpc/example/server/server
2626
instrumentation/google.golang.org/grpc/otelgrpc/example/client/client
2727

2828
tmp
29+
30+
instrumentation/github.com/emicklei/go-restful/otelrestful/example/example
31+
instrumentation/github.com/aws/aws-lambda-go/otellambda/example/example
32+
instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/example
33+
instrumentation/github.com/gin-gonic/gin/otelgin/example/example
34+
instrumentation/github.com/gorilla/mux/otelmux/example/example
35+
instrumentation/github.com/labstack/echo/otelecho/example/example
36+
instrumentation/host/example/example
37+
samplers/jaegerremote/example/example

instrumentation/github.com/gin-gonic/gin/otelgin/internal/semconvutil/httpconv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0
66

77
// Package semconvutil provides OpenTelemetry semantic convention utilities.
8-
package semconvutil
8+
package semconvutil // import "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin/internal/semconvutil"
99

1010
import (
1111
"fmt"

instrumentation/github.com/gin-gonic/gin/otelgin/internal/semconvutil/netconv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Copyright The OpenTelemetry Authors
55
// SPDX-License-Identifier: Apache-2.0
66

7-
package semconvutil // import "go.opentelemetry.io/contrib/internal/shared/semconvutil"
7+
package semconvutil // import "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin/internal/semconvutil"
88

99
import (
1010
"net"

instrumentation/github.com/labstack/echo/otelecho/echo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func Middleware(service string, opts ...Option) echo.MiddlewareFunc {
4545
cfg.Skipper = middleware.DefaultSkipper
4646
}
4747

48-
var hs semconv.HTTPServer
48+
hs := semconv.NewHTTPServer(nil)
4949

5050
return func(next echo.HandlerFunc) echo.HandlerFunc {
5151
return func(c echo.Context) error {

instrumentation/github.com/labstack/echo/otelecho/internal/semconv/env.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Copyright The OpenTelemetry Authors
55
// SPDX-License-Identifier: Apache-2.0
66

7-
package semconv
7+
package semconv // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/internal/semconv"
88

99
import (
1010
"context"

instrumentation/github.com/labstack/echo/otelecho/internal/semconv/httpconv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// Package semconv provides OpenTelemetry semantic convention types and
88
// functionality.
9-
package semconv
9+
package semconv // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/internal/semconv"
1010

1111
import (
1212
"fmt"

instrumentation/github.com/labstack/echo/otelecho/internal/semconv/test/common_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// Copyright The OpenTelemetry Authors
55
// SPDX-License-Identifier: Apache-2.0
66

7+
// Package test provides module isolated testing for the semconv package.
78
package test
89

910
import (

instrumentation/github.com/labstack/echo/otelecho/internal/semconv/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Copyright The OpenTelemetry Authors
55
// SPDX-License-Identifier: Apache-2.0
66

7-
package semconv
7+
package semconv // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/internal/semconv"
88

99
import (
1010
"net"

instrumentation/github.com/labstack/echo/otelecho/internal/semconv/v1.20.0.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Copyright The OpenTelemetry Authors
55
// SPDX-License-Identifier: Apache-2.0
66

7-
package semconv
7+
package semconv // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/internal/semconv"
88

99
import (
1010
"errors"

instrumentation/github.com/labstack/echo/otelecho/internal/semconvutil/httpconv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0
66

77
// Package semconvutil provides OpenTelemetry semantic convention utilities.
8-
package semconvutil
8+
package semconvutil // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/internal/semconvutil"
99

1010
import (
1111
"fmt"

instrumentation/github.com/labstack/echo/otelecho/internal/semconvutil/netconv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Copyright The OpenTelemetry Authors
55
// SPDX-License-Identifier: Apache-2.0
66

7-
package semconvutil // import "go.opentelemetry.io/contrib/internal/shared/semconvutil"
7+
package semconvutil // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/internal/semconvutil"
88

99
import (
1010
"net"

instrumentation/github.com/labstack/echo/otelecho/test/echo_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ func TestChildSpanFromCustomTracer(t *testing.T) {
6262
}
6363

6464
func TestTrace200(t *testing.T) {
65+
t.Setenv("OTEL_SEMCONV_STABILITY_OPT_IN", "http/dup")
6566
sr := tracetest.NewSpanRecorder()
6667
provider := trace.NewTracerProvider(trace.WithSpanProcessor(sr))
6768

@@ -162,6 +163,7 @@ func TestStatusError(t *testing.T) {
162163
},
163164
} {
164165
t.Run(tc.name, func(t *testing.T) {
166+
t.Setenv("OTEL_SEMCONV_STABILITY_OPT_IN", "http/dup")
165167
sr := tracetest.NewSpanRecorder()
166168
provider := trace.NewTracerProvider(trace.WithSpanProcessor(sr))
167169

0 commit comments

Comments
 (0)