Skip to content

Commit

Permalink
instrgen fixing imports (#3682)
Browse files Browse the repository at this point in the history
* instrgen fixing imports

* instrgen - adding comment about decision behind disabling linter

---------

Co-authored-by: Przemek Delewski <pdelewski@users.noreply.github.com>
Co-authored-by: Chester Cheung <cheung.zhy.csu@gmail.com>
  • Loading branch information
3 people authored Apr 14, 2023
1 parent e0d1de8 commit f887420
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 34 deletions.
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
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/interface/serializer/interface.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 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

0 comments on commit f887420

Please sign in to comment.