Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add host.id to resource auto-detection #3812

Merged
merged 12 commits into from
Mar 21, 2023
Merged

add host.id to resource auto-detection #3812

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cad0ef1
add platform specific hostIDReaders
mwear Feb 17, 2023
5e50909
add WithHostID option to Resource
mwear Feb 18, 2023
b9c7878
add changelog entry
mwear Feb 27, 2023
ab30fde
Apply suggestions from code review
mwear Mar 1, 2023
8c65da8
linting
mwear Mar 1, 2023
0f16d39
combine platform specific readers and tests
mwear Mar 6, 2023
a9bdee8
add todo to use assert.AnError after resource.Detect error handling i…
mwear Mar 7, 2023
8f6b557
move HostID test utilities to host_id_test
mwear Mar 8, 2023
0260501
return assert.AnError from mockHostIDProviderWithError
mwear Mar 8, 2023
7c093e1
use assert.ErrorIs
mwear Mar 9, 2023
6df6880
Merge branch 'main' into detect_host_id
mwear Mar 20, 2023
3230472
Merge branch 'main' into detect_host_id
MadVikingGod Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
return assert.AnError from mockHostIDProviderWithError
  • Loading branch information
@mwear
mwear committed Mar 8, 2023
commit 0260501d9f5bf2286441639b7466ab627c6aa89e
5 changes: 2 additions & 3 deletions sdk/resource/host_id_export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package resource_test

import (
"errors"
"github.com/stretchr/testify/assert"

"go.opentelemetry.io/otel/sdk/resource"
)
Expand All @@ -28,8 +28,7 @@ func mockHostIDProvider() {

func mockHostIDProviderWithError() {
resource.SetHostIDProvider(
// TODO: After #3844 merges, return assert.AnError and update tests in `resource_test.go`.
func() (string, error) { return "", errors.New("not found") },
func() (string, error) { return "", assert.AnError },
)
}

Expand Down
1 change: 1 addition & 0 deletions sdk/resource/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ func TestWithHostIDError(t *testing.T) {
)

require.Error(t, err)
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
assert.True(t, errors.Is(err, assert.AnError))
require.EqualValues(t, map[string]string{}, toMap(res))
}

Expand Down