Tyler Yahn eabcef4c2d Return merged Resource on schema conflict (#4876) ...

* Return merged Resource on schema conflict

* Add changes to changelog

* Doc returned resource to have no schema URL

* Refactor Merge based on feedback

* Add the schema URLs to the returned error

* Ensure no schema URL when merge conflict on detect

* Replaced isErr with wantErr in TestNew

* Update sdk/resource/auto_test.go

Co-authored-by: Robert Pająk <pellared@hotmail.com>

* Update TestDetect based on feedback

---------

Co-authored-by: Robert Pająk <pellared@hotmail.com>

2024-02-05 07:33:29 -08:00

..

auto_test.go

Return merged Resource on schema conflict (#4876)

2024-02-05 07:33:29 -08:00

auto.go

Return merged Resource on schema conflict (#4876)

2024-02-05 07:33:29 -08:00

benchmark_test.go

Use gofumpt instead of gofmt (#4623)

2023-10-16 10:02:21 -07:00

builtin_test.go

Use already enabled revive linter and add depguard (#2883)

2022-05-19 15:15:07 -05:00

builtin.go

Upgrade use of semconv to v1.24.0 (#4754)

2024-01-11 12:56:07 +01:00

config.go

add host.id to resource auto-detection (#3812)

2023-03-21 14:45:30 -05:00

container_test.go

Fix ContainerID detector on systemd with colon in cgroup path (#4449)

2024-01-23 13:04:46 -08:00

container.go

Fix ContainerID detector on systemd with colon in cgroup path (#4449)

2024-01-23 13:04:46 -08:00

doc.go

sdk/resource: Add Telemetry Stability label (#4080)

2023-05-11 07:25:32 -07:00

env_test.go

Upgrade use of semconv to v1.24.0 (#4754)

2024-01-11 12:56:07 +01:00

env.go

Upgrade use of semconv to v1.24.0 (#4754)

2024-01-11 12:56:07 +01:00

export_common_unix_test.go

Use ByteSliceToString from golang.org/x/sys/unix (#2924)

2022-05-26 07:31:35 -07:00

export_os_release_darwin_test.go

OS description attribute detector (#1840)

2021-07-08 13:35:27 -07:00

export_test.go

Use gofumpt instead of gofmt (#4623)

2023-10-16 10:02:21 -07:00

export_unix_test.go

Bump github.com/jcchavezs/porto from 0.2.1 to 0.3.0 in /internal/tools (#2288)

2021-10-15 11:36:56 -07:00

export_windows_test.go

OS description attribute detector (#1840)

2021-07-08 13:35:27 -07:00

host_id_bsd.go

Remove unused imports in host_id_bsd.go (#4041)

2023-05-01 08:07:05 -07:00

host_id_darwin.go

add host.id to resource auto-detection (#3812)

2023-03-21 14:45:30 -05:00

host_id_exec.go

sdk/resource: Fix build for BSD OSes (#4077)

2023-05-10 07:47:41 -07:00

host_id_export_test.go

add host.id to resource auto-detection (#3812)

2023-03-21 14:45:30 -05:00

host_id_linux.go

add host.id to resource auto-detection (#3812)

2023-03-21 14:45:30 -05:00

host_id_readfile_test.go

Fix empty host.id (#4317)

2023-07-18 17:37:20 +02:00

host_id_readfile.go

Fix empty host.id (#4317)

2023-07-18 17:37:20 +02:00

host_id_test.go

add host.id to resource auto-detection (#3812)

2023-03-21 14:45:30 -05:00

host_id_unsupported.go

add host.id to resource auto-detection (#3812)

2023-03-21 14:45:30 -05:00

host_id_windows_test.go

add host.id to resource auto-detection (#3812)

2023-03-21 14:45:30 -05:00

host_id_windows.go

add host.id to resource auto-detection (#3812)

2023-03-21 14:45:30 -05:00

host_id.go

Upgrade use of semconv to v1.24.0 (#4754)

2024-01-11 12:56:07 +01:00

os_release_darwin_test.go

OS description attribute detector (#1840)

2021-07-08 13:35:27 -07:00

os_release_darwin.go

OS description attribute detector (#1840)

2021-07-08 13:35:27 -07:00

os_release_unix_test.go

Bump github.com/jcchavezs/porto from 0.2.1 to 0.3.0 in /internal/tools (#2288)

2021-10-15 11:36:56 -07:00

os_release_unix.go

Use strings.Cut() instead of string.SplitN() (#4049)

2023-05-17 09:28:44 -07:00

os_test.go

Upgrade use of semconv to v1.24.0 (#4754)

2024-01-11 12:56:07 +01:00

os_unix_test.go

Replace ioutil with io and os (#3058)

2022-08-03 14:45:05 -07:00

os_unix.go

Use ByteSliceToString from golang.org/x/sys/unix (#2924)

2022-05-26 07:31:35 -07:00

os_unsupported.go

OS description attribute detector (#1840)

2021-07-08 13:35:27 -07:00

os_windows_test.go

OS description attribute detector (#1840)

2021-07-08 13:35:27 -07:00

os_windows.go

OS description attribute detector (#1840)

2021-07-08 13:35:27 -07:00

os.go

Upgrade use of semconv to v1.24.0 (#4754)

2024-01-11 12:56:07 +01:00

process_test.go

Use already enabled revive linter and add depguard (#2883)

2022-05-19 15:15:07 -05:00

process.go

Upgrade use of semconv to v1.24.0 (#4754)

2024-01-11 12:56:07 +01:00

resource_test.go

Return merged Resource on schema conflict (#4876)

2024-02-05 07:33:29 -08:00

resource.go

Return merged Resource on schema conflict (#4876)

2024-02-05 07:33:29 -08:00