Skip to content

Commit

Permalink
revert lint other files
Browse files Browse the repository at this point in the history
  • Loading branch information
scorpionknifes committed Apr 9, 2024
1 parent 26a63c0 commit 046f6e0
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 45 deletions.
8 changes: 3 additions & 5 deletions config/generated_config.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions instrgen/driver/testdata/expected/basic/fib.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
package main

import (
__atel_context "context"
"fmt"

__atel_context "context"
__atel_otel "go.opentelemetry.io/otel"
)

func foo(__atel_tracing_ctx __atel_context.Context) {
func foo(__atel_tracing_ctx __atel_context.Context,) {
__atel_child_tracing_ctx, __atel_span := __atel_otel.Tracer("foo").Start(__atel_tracing_ctx, "foo")
_ = __atel_child_tracing_ctx
defer __atel_span.End()
Expand Down
5 changes: 2 additions & 3 deletions instrgen/driver/testdata/expected/basic/goroutines.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
package main

import (
__atel_context "context"
"fmt"

__atel_context "context"
__atel_otel "go.opentelemetry.io/otel"
)

func goroutines(__atel_tracing_ctx __atel_context.Context) {
func goroutines(__atel_tracing_ctx __atel_context.Context,) {
__atel_child_tracing_ctx, __atel_span := __atel_otel.Tracer("goroutines").Start(__atel_tracing_ctx, "goroutines")
_ = __atel_child_tracing_ctx
defer __atel_span.End()
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/expected/basic/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package main

import (
__atel_context "context"
"fmt"
__atel_context "context"

"go.opentelemetry.io/contrib/instrgen/rtlib"
__atel_otel "go.opentelemetry.io/otel"
Expand Down
3 changes: 1 addition & 2 deletions instrgen/driver/testdata/expected/basic/methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package main

import (
__atel_context "context"

__atel_otel "go.opentelemetry.io/otel"
)

Expand Down Expand Up @@ -47,7 +46,7 @@ func (e element) get(__atel_tracing_ctx __atel_context.Context, a int) {
defer __atel_span.End()
}

func methods(__atel_tracing_ctx __atel_context.Context) {
func methods(__atel_tracing_ctx __atel_context.Context,) {
__atel_child_tracing_ctx, __atel_span := __atel_otel.Tracer("methods").Start(__atel_tracing_ctx, "methods")
_ = __atel_child_tracing_ctx
defer __atel_span.End()
Expand Down
5 changes: 2 additions & 3 deletions instrgen/driver/testdata/expected/basic/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
package main

import (
__atel_context "context"
"os"

__atel_context "context"
__atel_otel "go.opentelemetry.io/otel"
)

func Close() error {
return nil
}

func pack(__atel_tracing_ctx __atel_context.Context) {
func pack(__atel_tracing_ctx __atel_context.Context,) {
__atel_child_tracing_ctx, __atel_span := __atel_otel.Tracer("pack").Start(__atel_tracing_ctx, "pack")
_ = __atel_child_tracing_ctx
defer __atel_span.End()
Expand Down
5 changes: 2 additions & 3 deletions instrgen/driver/testdata/expected/interface/app/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
package app

import (
__atel_context "context"
"fmt"

__atel_context "context"
__atel_otel "go.opentelemetry.io/otel"
)

type BasicSerializer struct {
}

func (b BasicSerializer) Serialize(__atel_tracing_ctx __atel_context.Context) {
func (b BasicSerializer) Serialize(__atel_tracing_ctx __atel_context.Context,) {
__atel_child_tracing_ctx, __atel_span := __atel_otel.Tracer("Serialize").Start(__atel_tracing_ctx, "Serialize")
_ = __atel_child_tracing_ctx
defer __atel_span.End()
Expand Down
7 changes: 3 additions & 4 deletions instrgen/driver/testdata/expected/interface/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
package main

import (
__atel_context "context"

"go.opentelemetry.io/contrib/instrgen/rtlib"
. "go.opentelemetry.io/contrib/instrgen/testdata/interface/app"
. "go.opentelemetry.io/contrib/instrgen/testdata/interface/serializer"
__atel_otel "go.opentelemetry.io/otel"
__atel_context "context"
. "go.opentelemetry.io/contrib/instrgen/testdata/interface/serializer"
"go.opentelemetry.io/contrib/instrgen/rtlib"
)

func main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ package serializer
import __atel_context "context"

type Serializer interface {
Serialize(__atel_tracing_ctx __atel_context.Context)
Serialize(__atel_tracing_ctx __atel_context.Context,)
}
3 changes: 1 addition & 2 deletions instrgen/driver/testdata/expected/selector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
package main

import (
__atel_context "context"

"go.opentelemetry.io/contrib/instrgen/rtlib"
__atel_otel "go.opentelemetry.io/otel"
__atel_context "context"
)

type Driver interface {
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/interface/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
package main

import (
"go.opentelemetry.io/contrib/instrgen/rtlib"
. "go.opentelemetry.io/contrib/instrgen/testdata/interface/app"
. "go.opentelemetry.io/contrib/instrgen/testdata/interface/serializer"
"go.opentelemetry.io/contrib/instrgen/rtlib"
)

func main() {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ import (
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
_ "github.com/jcchavezs/porto/cmd/porto"
_ "github.com/wadey/gocovmerge"
_ "golang.org/x/exp/cmd/gorelease"
_ "golang.org/x/tools/cmd/stringer"
_ "golang.org/x/vuln/cmd/govulncheck"

_ "go.opentelemetry.io/build-tools/crosslink"
_ "go.opentelemetry.io/build-tools/dbotconf"
_ "go.opentelemetry.io/build-tools/gotmpl"
_ "go.opentelemetry.io/build-tools/multimod"
_ "golang.org/x/exp/cmd/gorelease"
_ "golang.org/x/tools/cmd/stringer"
_ "golang.org/x/vuln/cmd/govulncheck"
)

0 comments on commit 046f6e0

Please sign in to comment.