From 00d8ca5890a8bf74d9b0a5c05742833202860d9f Mon Sep 17 00:00:00 2001 From: ET Date: Tue, 28 Sep 2021 09:08:14 -0700 Subject: [PATCH] Add go-1.17-compatible build directives. (#2263) Co-authored-by: Tyler Yahn --- exporters/jaeger/assertsocketbuffersize_test.go | 1 + sdk/metric/stress_test.go | 1 + sdk/resource/export_common_unix_test.go | 1 + sdk/resource/os_unix.go | 1 + sdk/resource/os_unix_test.go | 1 + 5 files changed, 5 insertions(+) diff --git a/exporters/jaeger/assertsocketbuffersize_test.go b/exporters/jaeger/assertsocketbuffersize_test.go index 40f9ce830c7..8d21f6550df 100644 --- a/exporters/jaeger/assertsocketbuffersize_test.go +++ b/exporters/jaeger/assertsocketbuffersize_test.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows // +build !windows package jaeger diff --git a/sdk/metric/stress_test.go b/sdk/metric/stress_test.go index f8da16436d8..09d89515d78 100644 --- a/sdk/metric/stress_test.go +++ b/sdk/metric/stress_test.go @@ -14,6 +14,7 @@ // This test is too large for the race detector. This SDK uses no locks // that the race detector would help with, anyway. +//go:build !race // +build !race package metric diff --git a/sdk/resource/export_common_unix_test.go b/sdk/resource/export_common_unix_test.go index 3f8868db3fd..3b8b03cf43e 100644 --- a/sdk/resource/export_common_unix_test.go +++ b/sdk/resource/export_common_unix_test.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos // +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos package resource // import "go.opentelemetry.io/otel/sdk/resource" diff --git a/sdk/resource/os_unix.go b/sdk/resource/os_unix.go index cb0252d7e5e..42894a15b5c 100644 --- a/sdk/resource/os_unix.go +++ b/sdk/resource/os_unix.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos // +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos package resource // import "go.opentelemetry.io/otel/sdk/resource" diff --git a/sdk/resource/os_unix_test.go b/sdk/resource/os_unix_test.go index 278a5f4608b..bf15463a931 100644 --- a/sdk/resource/os_unix_test.go +++ b/sdk/resource/os_unix_test.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos // +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos package resource_test