File tree 3 files changed +57
-23
lines changed
3 files changed +57
-23
lines changed Original file line number Diff line number Diff line change @@ -17,8 +17,6 @@ package resource // import "go.opentelemetry.io/otel/sdk/resource"
17
17
import (
18
18
"context"
19
19
"errors"
20
- "os"
21
- "os/exec"
22
20
"strings"
23
21
24
22
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
@@ -38,27 +36,6 @@ type fileReader func(string) (string, error)
38
36
39
37
type commandExecutor func (string , ... string ) (string , error )
40
38
41
- // nolint: unused // This is used by the hostReaderBSD, gated by build tags.
42
- func readFile (filename string ) (string , error ) {
43
- b , err := os .ReadFile (filename )
44
- if err != nil {
45
- return "" , nil
46
- }
47
-
48
- return string (b ), nil
49
- }
50
-
51
- // nolint: unused // This is used by the hostReaderBSD, gated by build tags.
52
- func execCommand (name string , arg ... string ) (string , error ) {
53
- cmd := exec .Command (name , arg ... )
54
- b , err := cmd .Output ()
55
- if err != nil {
56
- return "" , err
57
- }
58
-
59
- return string (b ), nil
60
- }
61
-
62
39
// hostIDReaderBSD implements hostIDReader.
63
40
type hostIDReaderBSD struct {
64
41
execCommand commandExecutor
Original file line number Diff line number Diff line change
1
+ // Copyright The OpenTelemetry Authors
2
+ //
3
+ // Licensed under the Apache License, Version 2.0 (the "License");
4
+ // you may not use this file except in compliance with the License.
5
+ // You may obtain a copy of the License at
6
+ //
7
+ // http://www.apache.org/licenses/LICENSE-2.0
8
+ //
9
+ // Unless required by applicable law or agreed to in writing, software
10
+ // distributed under the License is distributed on an "AS IS" BASIS,
11
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ // See the License for the specific language governing permissions and
13
+ // limitations under the License.
14
+
15
+ //go:build bsd || darwin
16
+
17
+ package resource // import "go.opentelemetry.io/otel/sdk/resource"
18
+
19
+ import "os/exec"
20
+
21
+ func execCommand (name string , arg ... string ) (string , error ) {
22
+ cmd := exec .Command (name , arg ... )
23
+ b , err := cmd .Output ()
24
+ if err != nil {
25
+ return "" , err
26
+ }
27
+
28
+ return string (b ), nil
29
+ }
Original file line number Diff line number Diff line change
1
+ // Copyright The OpenTelemetry Authors
2
+ //
3
+ // Licensed under the Apache License, Version 2.0 (the "License");
4
+ // you may not use this file except in compliance with the License.
5
+ // You may obtain a copy of the License at
6
+ //
7
+ // http://www.apache.org/licenses/LICENSE-2.0
8
+ //
9
+ // Unless required by applicable law or agreed to in writing, software
10
+ // distributed under the License is distributed on an "AS IS" BASIS,
11
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ // See the License for the specific language governing permissions and
13
+ // limitations under the License.
14
+
15
+ //go:build bsd || linux
16
+
17
+ package resource // import "go.opentelemetry.io/otel/sdk/resource"
18
+
19
+ import "os"
20
+
21
+ func readFile (filename string ) (string , error ) {
22
+ b , err := os .ReadFile (filename )
23
+ if err != nil {
24
+ return "" , nil
25
+ }
26
+
27
+ return string (b ), nil
28
+ }
You can’t perform that action at this time.
0 commit comments