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

instrgen fixing imports #3682

Merged
merged 3 commits into from
Apr 14, 2023
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 instrgen/driver/testdata/basic/fib.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
Expand Down
4 changes: 1 addition & 3 deletions instrgen/driver/testdata/basic/goroutines.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
"fmt"

"go.opentelemetry.io/contrib/instrgen/rtlib"
)

func goroutines() {
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/basic/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
Expand Down
6 changes: 1 addition & 5 deletions instrgen/driver/testdata/basic/methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
"go.opentelemetry.io/contrib/instrgen/rtlib"
)

type element struct {
}

Expand Down
4 changes: 1 addition & 3 deletions instrgen/driver/testdata/basic/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
"os"

"go.opentelemetry.io/contrib/instrgen/rtlib"
)

func Close() error {
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/dummy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

func main() {
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/expected/basic/fib.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
Expand Down
4 changes: 1 addition & 3 deletions instrgen/driver/testdata/expected/basic/goroutines.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
"fmt"
__atel_context "context"

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

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 @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
Expand Down
5 changes: 2 additions & 3 deletions instrgen/driver/testdata/expected/basic/methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

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

type element struct {
Expand Down
4 changes: 1 addition & 3 deletions instrgen/driver/testdata/expected/basic/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
"os"
__atel_context "context"

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

Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/expected/interface/app/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package app

import (
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/expected/interface/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package serializer

import __atel_context "context"
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/expected/selector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/funwithoutpathtoroot/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/interface/app/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package app

import (
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 @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package serializer

type Serializer interface {
Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/selector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//nolint:all
//nolint:all // Linter is executed at the same time as tests which leads to race conditions and failures.
package main

import (
Expand Down