diff --git a/CHANGELOG.md b/CHANGELOG.md index 3afaca3ff..a2b2479f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http ### Fixed - Fix spans parsing from eBPF for the legacy (go version < 1.24 otel-go < 1.33) otel global instrumentation. ([#1960](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1960)) +- Stop adding `process.runtime.description` to `Resource` to follow OpenTelemetry semantic conventions. ([#1986](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1986)) ## [v0.21.0] - 2025-02-18 diff --git a/instrumentation.go b/instrumentation.go index 4d241c0c4..39c859b40 100644 --- a/instrumentation.go +++ b/instrumentation.go @@ -10,7 +10,6 @@ import ( "log/slog" "os" "path/filepath" - "runtime" "strconv" "strings" "sync" @@ -277,16 +276,11 @@ func (c instConfig) res() (res *resource.Resource) { if runName == "gc" { runName = "go" } - runDesc := fmt.Sprintf( - "go version %s %s/%s", - bi.GoVersion, runtime.GOOS, runtime.GOARCH, - ) attrs = append( attrs, semconv.ProcessRuntimeName(runName), semconv.ProcessRuntimeVersion(bi.GoVersion), - semconv.ProcessRuntimeDescription(runDesc), ) return res diff --git a/internal/test/e2e/autosdk/traces.json b/internal/test/e2e/autosdk/traces.json index 1b368f5f8..eda5be82a 100644 --- a/internal/test/e2e/autosdk/traces.json +++ b/internal/test/e2e/autosdk/traces.json @@ -3,12 +3,6 @@ { "resource": { "attributes": [ - { - "key": "process.runtime.description", - "value": { - "stringValue": "go version 1.24.1 linux/VALID_ARCH" - } - }, { "key": "process.runtime.name", "value": { diff --git a/internal/test/e2e/databasesql/traces.json b/internal/test/e2e/databasesql/traces.json index 706cb250f..99683c5a4 100644 --- a/internal/test/e2e/databasesql/traces.json +++ b/internal/test/e2e/databasesql/traces.json @@ -3,12 +3,6 @@ { "resource": { "attributes": [ - { - "key": "process.runtime.description", - "value": { - "stringValue": "go version 1.24.1 linux/VALID_ARCH" - } - }, { "key": "process.runtime.name", "value": { diff --git a/internal/test/e2e/gin/traces.json b/internal/test/e2e/gin/traces.json index c668e79b2..a849ede5f 100644 --- a/internal/test/e2e/gin/traces.json +++ b/internal/test/e2e/gin/traces.json @@ -3,12 +3,6 @@ { "resource": { "attributes": [ - { - "key": "process.runtime.description", - "value": { - "stringValue": "go version 1.24.1 linux/VALID_ARCH" - } - }, { "key": "process.runtime.name", "value": { diff --git a/internal/test/e2e/grpc/traces.json b/internal/test/e2e/grpc/traces.json index b41a479ce..331f5ed41 100644 --- a/internal/test/e2e/grpc/traces.json +++ b/internal/test/e2e/grpc/traces.json @@ -3,12 +3,6 @@ { "resource": { "attributes": [ - { - "key": "process.runtime.description", - "value": { - "stringValue": "go version 1.24.1 linux/VALID_ARCH" - } - }, { "key": "process.runtime.name", "value": { diff --git a/internal/test/e2e/kafka-go/traces.json b/internal/test/e2e/kafka-go/traces.json index ea3c2fd00..239efe2ed 100644 --- a/internal/test/e2e/kafka-go/traces.json +++ b/internal/test/e2e/kafka-go/traces.json @@ -3,12 +3,6 @@ { "resource": { "attributes": [ - { - "key": "process.runtime.description", - "value": { - "stringValue": "go version 1.24.1 linux/VALID_ARCH" - } - }, { "key": "process.runtime.name", "value": { diff --git a/internal/test/e2e/nethttp/traces.json b/internal/test/e2e/nethttp/traces.json index 94303fd33..b2b96ae3b 100644 --- a/internal/test/e2e/nethttp/traces.json +++ b/internal/test/e2e/nethttp/traces.json @@ -3,12 +3,6 @@ { "resource": { "attributes": [ - { - "key": "process.runtime.description", - "value": { - "stringValue": "go version 1.24.1 linux/VALID_ARCH" - } - }, { "key": "process.runtime.name", "value": { diff --git a/internal/test/e2e/nethttp_custom/traces.json b/internal/test/e2e/nethttp_custom/traces.json index 2f1edc259..1bbbfb033 100644 --- a/internal/test/e2e/nethttp_custom/traces.json +++ b/internal/test/e2e/nethttp_custom/traces.json @@ -3,12 +3,6 @@ { "resource": { "attributes": [ - { - "key": "process.runtime.description", - "value": { - "stringValue": "go version 1.24.1 linux/VALID_ARCH" - } - }, { "key": "process.runtime.name", "value": { diff --git a/internal/test/e2e/otelglobal/traces.json b/internal/test/e2e/otelglobal/traces.json index e2027d9e3..799c274c0 100644 --- a/internal/test/e2e/otelglobal/traces.json +++ b/internal/test/e2e/otelglobal/traces.json @@ -3,12 +3,6 @@ { "resource": { "attributes": [ - { - "key": "process.runtime.description", - "value": { - "stringValue": "go version 1.24.1 linux/VALID_ARCH" - } - }, { "key": "process.runtime.name", "value": { diff --git a/internal/test/test_helpers/utilities.sh b/internal/test/test_helpers/utilities.sh index 2dbcafe29..348325c8e 100644 --- a/internal/test/test_helpers/utilities.sh +++ b/internal/test/test_helpers/utilities.sh @@ -161,12 +161,6 @@ redact_json() { end | .resourceSpans[].scopeSpans|=sort_by(.scope.name) | .resourceSpans[].scopeSpans[].spans|=sort_by(.kind) - | .resourceSpans[].resource.attributes[]? |= if - (.key == "process.runtime.description") then - .value.stringValue |= sub("amd64|arm64"; "VALID_ARCH") - else - . - end ' > ${BATS_TEST_DIRNAME}/traces.json }