Skip to content

Commit 180b355

Browse files
pellaredhanyuancheungMrAlias
authored
Move readFile and execCommand to seperate files (#4015)
Co-authored-by: Chester Cheung <[email protected]> Co-authored-by: Tyler Yahn <[email protected]>
1 parent 15d6ba2 commit 180b355

File tree

3 files changed

+57
-23
lines changed

3 files changed

+57
-23
lines changed

sdk/resource/host_id.go

-23
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ package resource // import "go.opentelemetry.io/otel/sdk/resource"
1717
import (
1818
"context"
1919
"errors"
20-
"os"
21-
"os/exec"
2220
"strings"
2321

2422
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
@@ -38,27 +36,6 @@ type fileReader func(string) (string, error)
3836

3937
type commandExecutor func(string, ...string) (string, error)
4038

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-
6239
// hostIDReaderBSD implements hostIDReader.
6340
type hostIDReaderBSD struct {
6441
execCommand commandExecutor

sdk/resource/host_id_exec.go

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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+
}

sdk/resource/host_id_readfile.go

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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+
}

0 commit comments

Comments
 (0)