From 9b0c4d2caf7a5fb88714e4c64fe61d5fbf1c0b8a Mon Sep 17 00:00:00 2001
From: Matthew Wear <matthew.wear@gmail.com>
Date: Tue, 18 Jul 2023 08:37:20 -0700
Subject: [PATCH] Fix empty host.id (#4317)

---
 CHANGELOG.md                          |  1 +
 sdk/resource/host_id_readfile.go      |  2 +-
 sdk/resource/host_id_readfile_test.go | 53 +++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 sdk/resource/host_id_readfile_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 770c6250764..15731d8c22b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Correctly format log messages from the `go.opentelemetry.io/otel/exporters/zipkin` exporter. (#4143)
 - Log an error for calls to `NewView` in `go.opentelemetry.io/otel/sdk/metric` that have empty criteria. (#4307)
+- Fix `resource.WithHostID()` to not set an empty `host.id`. (#4317)
 
 ## [1.16.0/0.39.0] 2023-05-18
 
diff --git a/sdk/resource/host_id_readfile.go b/sdk/resource/host_id_readfile.go
index f92c6dad0f9..721e3ca6e7d 100644
--- a/sdk/resource/host_id_readfile.go
+++ b/sdk/resource/host_id_readfile.go
@@ -21,7 +21,7 @@ import "os"
 func readFile(filename string) (string, error) {
 	b, err := os.ReadFile(filename)
 	if err != nil {
-		return "", nil
+		return "", err
 	}
 
 	return string(b), nil
diff --git a/sdk/resource/host_id_readfile_test.go b/sdk/resource/host_id_readfile_test.go
new file mode 100644
index 00000000000..f071a05cc0c
--- /dev/null
+++ b/sdk/resource/host_id_readfile_test.go
@@ -0,0 +1,53 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build linux || dragonfly || freebsd || netbsd || openbsd || solaris
+
+package resource
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestReadFileExistent(t *testing.T) {
+	fileContents := "foo"
+
+	f, err := os.CreateTemp("", "readfile_")
+	require.NoError(t, err)
+
+	defer os.Remove(f.Name())
+
+	_, err = f.WriteString(fileContents)
+	require.NoError(t, err)
+	require.NoError(t, f.Close())
+
+	result, err := readFile(f.Name())
+	require.NoError(t, err)
+	require.Equal(t, result, fileContents)
+}
+
+func TestReadFileNonExistent(t *testing.T) {
+	// create unique filename
+	f, err := os.CreateTemp("", "readfile_")
+	require.NoError(t, err)
+
+	// make file non-existent
+	require.NoError(t, os.Remove(f.Name()))
+
+	_, err = readFile(f.Name())
+	require.ErrorIs(t, err, os.ErrNotExist)
+}