Remove the obsolete +build directive (#9304)

`// +build` was replaced with `//go:build` directive in Go 1.17. The `+build` can be removed since we support only 1.20 and 1.21
open-telemetry · Jan 17, 2024 · 20710ff · 20710ff
1 parent 6712bf2
commit 20710ff
Show file tree

Hide file tree

Showing 26 changed files with 20 additions and 25 deletions.
diff --git a/.chloggen/remove-old-go-build-directives.yaml b/.chloggen/remove-old-go-build-directives.yaml
@@ -0,0 +1,20 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: all
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove obsolete "// +build" diractive
+
+# One or more tracking issues or pull requests related to the change
+issues: [9304]
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]
diff --git a/cmd/builder/internal/builder/templates/main_others.go.tmpl b/cmd/builder/internal/builder/templates/main_others.go.tmpl
@@ -1,7 +1,6 @@
 // Code generated by "go.opentelemetry.io/collector/cmd/builder". DO NOT EDIT.
 
 //go:build !windows
-// +build !windows
 
 package main
 

diff --git a/cmd/builder/internal/builder/templates/main_windows.go.tmpl b/cmd/builder/internal/builder/templates/main_windows.go.tmpl
@@ -1,7 +1,6 @@
 // Code generated by "go.opentelemetry.io/collector/cmd/builder". DO NOT EDIT.
 
 //go:build windows
-// +build windows
 
 package main
 

diff --git a/cmd/otelcorecol/main_others.go b/cmd/otelcorecol/main_others.go
diff --git a/cmd/otelcorecol/main_windows.go b/cmd/otelcorecol/main_windows.go
diff --git a/exporter/internal/otlptext/known_sync_error.go b/exporter/internal/otlptext/known_sync_error.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build linux || darwin
-// +build linux darwin
 
 package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
 

diff --git a/exporter/internal/otlptext/known_sync_error_other.go b/exporter/internal/otlptext/known_sync_error_other.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build !linux && !darwin && !windows
-// +build !linux,!darwin,!windows
 
 package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
 

diff --git a/exporter/internal/otlptext/known_sync_error_windows.go b/exporter/internal/otlptext/known_sync_error_windows.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build windows
-// +build windows
 
 package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
 

diff --git a/internal/cgroups/cgroup.go b/internal/cgroups/cgroup.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
 

diff --git a/internal/cgroups/cgroup_test.go b/internal/cgroups/cgroup_test.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups
 

diff --git a/internal/cgroups/cgroups.go b/internal/cgroups/cgroups.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
 import (

diff --git a/internal/cgroups/cgroups_test.go b/internal/cgroups/cgroups_test.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups
 

diff --git a/internal/cgroups/errors.go b/internal/cgroups/errors.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
 

diff --git a/internal/cgroups/mountpoint.go b/internal/cgroups/mountpoint.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
 

diff --git a/internal/cgroups/mountpoint_test.go b/internal/cgroups/mountpoint_test.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups
 

diff --git a/internal/cgroups/subsys.go b/internal/cgroups/subsys.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups // import "go.opentelemetry.io/collector/internal/cgroups"
 

diff --git a/internal/cgroups/subsys_test.go b/internal/cgroups/subsys_test.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups
 

diff --git a/internal/cgroups/util_test.go b/internal/cgroups/util_test.go
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build linux
-// +build linux
 
 package cgroups
 

diff --git a/internal/iruntime/total_memory_linux.go b/internal/iruntime/total_memory_linux.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build linux
-// +build linux
 
 package iruntime // import "go.opentelemetry.io/collector/internal/iruntime"
 

diff --git a/internal/iruntime/total_memory_linux_test.go b/internal/iruntime/total_memory_linux_test.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build linux
-// +build linux
 
 package iruntime
 

diff --git a/internal/iruntime/total_memory_other.go b/internal/iruntime/total_memory_other.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build !linux
-// +build !linux
 
 package iruntime // import "go.opentelemetry.io/collector/internal/iruntime"
 

diff --git a/internal/iruntime/total_memory_other_test.go b/internal/iruntime/total_memory_other_test.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build !linux
-// +build !linux
 
 package iruntime
 

diff --git a/internal/tools/tools.go b/internal/tools/tools.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build tools
-// +build tools
 
 package tools // import "go.opentelemetry.io/collector/internal/tools"
 

diff --git a/otelcol/collector_windows.go b/otelcol/collector_windows.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build windows
-// +build windows
 
 package otelcol // import "go.opentelemetry.io/collector/otelcol"
 

diff --git a/otelcol/collector_windows_test.go b/otelcol/collector_windows_test.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build windows
-// +build windows
 
 package otelcol
 

diff --git a/service/internal/proctelemetry/process_telemetry_linux_test.go b/service/internal/proctelemetry/process_telemetry_linux_test.go
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build linux
-// +build linux
 
 package proctelemetry