diff --git a/.chloggen/k8sattr_semconv140.yaml b/.chloggen/k8sattr_semconv140.yaml new file mode 100644 index 000000000000..f078d831e8fe --- /dev/null +++ b/.chloggen/k8sattr_semconv140.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog) +component: processor/k8s_attributes + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Bump version of semconv to 1.40 + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [46644] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/.golangci.yml b/.golangci.yml index 886594eefb64..b5b376cf8c48 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -220,6 +220,7 @@ linters: - go.opentelemetry.io/otel/semconv/v1.34.0 - go.opentelemetry.io/otel/semconv/v1.38.0 - go.opentelemetry.io/otel/semconv/v1.39.0 + - go.opentelemetry.io/otel/semconv/v1.40.0 semconv-in-test: list-mode: lax diff --git a/internal/datadog/e2e/go.mod b/internal/datadog/e2e/go.mod index 7a4286967c55..fe6257dfbc76 100644 --- a/internal/datadog/e2e/go.mod +++ b/internal/datadog/e2e/go.mod @@ -457,7 +457,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.66.0 // indirect go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.40.0 // indirect - go.opentelemetry.io/otel v1.41.0 // indirect + go.opentelemetry.io/otel v1.41.1-0.20260304125011-e2305d228bc2 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.40.0 // indirect @@ -470,11 +470,11 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.40.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.40.0 // indirect go.opentelemetry.io/otel/log v0.16.0 // indirect - go.opentelemetry.io/otel/metric v1.41.0 // indirect + go.opentelemetry.io/otel/metric v1.41.1-0.20260304125011-e2305d228bc2 // indirect go.opentelemetry.io/otel/sdk v1.41.0 // indirect go.opentelemetry.io/otel/sdk/log v0.16.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.41.0 // indirect - go.opentelemetry.io/otel/trace v1.41.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.41.1-0.20260304125011-e2305d228bc2 // indirect + go.opentelemetry.io/otel/trace v1.41.1-0.20260304125011-e2305d228bc2 // indirect go.opentelemetry.io/proto/otlp v1.9.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/dig v1.19.0 // indirect diff --git a/internal/datadog/e2e/go.sum b/internal/datadog/e2e/go.sum index 50e87135552f..1d4128b6f7aa 100644 --- a/internal/datadog/e2e/go.sum +++ b/internal/datadog/e2e/go.sum @@ -1156,8 +1156,8 @@ go.opentelemetry.io/contrib/propagators/b3 v1.40.0 h1:xariChe8OOVF3rNlfzGFgQc61n go.opentelemetry.io/contrib/propagators/b3 v1.40.0/go.mod h1:72WvbdxbOfXaELEQfonFfOL6osvcVjI7uJEE8C2nkrs= go.opentelemetry.io/contrib/zpages v0.65.0 h1:mi6aZS4PRSDIOYmr8DB7mdKpuyL+Q7ivIhbq2UV+NrQ= go.opentelemetry.io/contrib/zpages v0.65.0/go.mod h1:eMI6Q53htJ08b8+QxQsIjofw+oUSsT4ieNGu5fcimoU= -go.opentelemetry.io/otel v1.41.0 h1:YlEwVsGAlCvczDILpUXpIpPSL/VPugt7zHThEMLce1c= -go.opentelemetry.io/otel v1.41.0/go.mod h1:Yt4UwgEKeT05QbLwbyHXEwhnjxNO6D8L5PQP51/46dE= +go.opentelemetry.io/otel v1.41.1-0.20260304125011-e2305d228bc2 h1:JWMv8F/Kj1Cd6Etx+d5se9j0sVkLjV6Dh4SsUaRCP0w= +go.opentelemetry.io/otel v1.41.1-0.20260304125011-e2305d228bc2/go.mod h1:3aFZ+rUrAELOVa1rEO94NDjzbf9fVIhjRpj/ZX7tA/w= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0 h1:ZVg+kCXxd9LtAaQNKBxAvJ5NpMf7LpvEr4MIZqb0TMQ= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0/go.mod h1:hh0tMeZ75CCXrHd9OXRYxTlCAdxcXioWHFIpYw2rZu8= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0 h1:djrxvDxAe44mJUrKataUbOhCKhR3F8QCyWucO16hTQs= @@ -1184,18 +1184,18 @@ go.opentelemetry.io/otel/log v0.16.0 h1:DeuBPqCi6pQwtCK0pO4fvMB5eBq6sNxEnuTs88pj go.opentelemetry.io/otel/log v0.16.0/go.mod h1:rWsmqNVTLIA8UnwYVOItjyEZDbKIkMxdQunsIhpUMes= go.opentelemetry.io/otel/log/logtest v0.16.0 h1:jr1CG3Z6FD9pwUaL/D0s0X4lY2ZVm1jP3JfCtzGxUmE= go.opentelemetry.io/otel/log/logtest v0.16.0/go.mod h1:qeeZw+cI/rAtCzZ03Kq1ozq6C4z/PCa+K+bb0eJfKNs= -go.opentelemetry.io/otel/metric v1.41.0 h1:rFnDcs4gRzBcsO9tS8LCpgR0dxg4aaxWlJxCno7JlTQ= -go.opentelemetry.io/otel/metric v1.41.0/go.mod h1:xPvCwd9pU0VN8tPZYzDZV/BMj9CM9vs00GuBjeKhJps= +go.opentelemetry.io/otel/metric v1.41.1-0.20260304125011-e2305d228bc2 h1:F3m5nPevzY1Yx9mfUyeKVdok1DBjY3Ed5Cn3Rz7r4OI= +go.opentelemetry.io/otel/metric v1.41.1-0.20260304125011-e2305d228bc2/go.mod h1:F3UaAQzxW1d7NnxfGtoFyXwrpDLVgXQvAKSSp6QjlR4= go.opentelemetry.io/otel/sdk v1.41.0 h1:YPIEXKmiAwkGl3Gu1huk1aYWwtpRLeskpV+wPisxBp8= go.opentelemetry.io/otel/sdk v1.41.0/go.mod h1:ahFdU0G5y8IxglBf0QBJXgSe7agzjE4GiTJ6HT9ud90= go.opentelemetry.io/otel/sdk/log v0.16.0 h1:e/b4bdlQwC5fnGtG3dlXUrNOnP7c8YLVSpSfEBIkTnI= go.opentelemetry.io/otel/sdk/log v0.16.0/go.mod h1:JKfP3T6ycy7QEuv3Hj8oKDy7KItrEkus8XJE6EoSzw4= go.opentelemetry.io/otel/sdk/log/logtest v0.16.0 h1:/XVkpZ41rVRTP4DfMgYv1nEtNmf65XPPyAdqV90TMy4= go.opentelemetry.io/otel/sdk/log/logtest v0.16.0/go.mod h1:iOOPgQr5MY9oac/F5W86mXdeyWZGleIx3uXO98X2R6Y= -go.opentelemetry.io/otel/sdk/metric v1.41.0 h1:siZQIYBAUd1rlIWQT2uCxWJxcCO7q3TriaMlf08rXw8= -go.opentelemetry.io/otel/sdk/metric v1.41.0/go.mod h1:HNBuSvT7ROaGtGI50ArdRLUnvRTRGniSUZbxiWxSO8Y= -go.opentelemetry.io/otel/trace v1.41.0 h1:Vbk2co6bhj8L59ZJ6/xFTskY+tGAbOnCtQGVVa9TIN0= -go.opentelemetry.io/otel/trace v1.41.0/go.mod h1:U1NU4ULCoxeDKc09yCWdWe+3QoyweJcISEVa1RBzOis= +go.opentelemetry.io/otel/sdk/metric v1.41.1-0.20260304125011-e2305d228bc2 h1:Quu+R3idalTXLp24BLvRWlsfQCE+UV2kQbU3WXQtKrc= +go.opentelemetry.io/otel/sdk/metric v1.41.1-0.20260304125011-e2305d228bc2/go.mod h1:3YZsZMqZuLJz7YK2vvcQ+2TtIkTt81rVDsgVJtT1+7o= +go.opentelemetry.io/otel/trace v1.41.1-0.20260304125011-e2305d228bc2 h1:BxHMb3yWJFkHKfLa79uXQh7aKpuldue1Diybj7IlXDY= +go.opentelemetry.io/otel/trace v1.41.1-0.20260304125011-e2305d228bc2/go.mod h1:cqXi+pwihSpIfBt0zxlxHRiZma5J0KTAyrd0wPvglbY= go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A= go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4= go.opentelemetry.io/proto/slim/otlp v1.9.0 h1:fPVMv8tP3TrsqlkH1HWYUpbCY9cAIemx184VGkS6vlE= diff --git a/processor/k8sattributesprocessor/README.md b/processor/k8sattributesprocessor/README.md index e21e2643ad96..84668f3369b1 100644 --- a/processor/k8sattributesprocessor/README.md +++ b/processor/k8sattributesprocessor/README.md @@ -1114,4 +1114,4 @@ The breaking changes between the 2 schemas are the following: - `k8s.namespace.annotations.` -> `k8s.namespace.annotation.` All attributes emitted through the `processor.k8sattributes.EmitV1K8sConventions` feature gate -are currently in `alpha` stability and are actively moving towards `stable` stability. +are currently in `beta` stability and are actively moving towards `stable` stability. diff --git a/processor/k8sattributesprocessor/config.go b/processor/k8sattributesprocessor/config.go index 72bb94c7a593..7fdb74ea14c4 100644 --- a/processor/k8sattributesprocessor/config.go +++ b/processor/k8sattributesprocessor/config.go @@ -9,7 +9,7 @@ import ( "regexp" "time" - conventions "go.opentelemetry.io/otel/semconv/v1.39.0" + conventions "go.opentelemetry.io/otel/semconv/v1.40.0" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor/internal/kube" diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index bb6ff86d8797..591346441e45 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -34,10 +34,10 @@ require ( go.opentelemetry.io/collector/receiver/otlpreceiver v0.147.0 go.opentelemetry.io/collector/receiver/receivertest v0.147.0 go.opentelemetry.io/collector/receiver/xreceiver v0.147.0 - go.opentelemetry.io/otel v1.41.0 - go.opentelemetry.io/otel/metric v1.41.0 - go.opentelemetry.io/otel/sdk/metric v1.41.0 - go.opentelemetry.io/otel/trace v1.41.0 + go.opentelemetry.io/otel v1.41.1-0.20260304125011-e2305d228bc2 + go.opentelemetry.io/otel/metric v1.41.1-0.20260304125011-e2305d228bc2 + go.opentelemetry.io/otel/sdk/metric v1.41.1-0.20260304125011-e2305d228bc2 + go.opentelemetry.io/otel/trace v1.41.1-0.20260304125011-e2305d228bc2 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.1 diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 26a825408980..d61bb56a228d 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -264,20 +264,20 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0/go.mod h1:KDgtbWKTQs4bM+VPUr6WlL9m/WXcmkCcBlIzqxPGzmI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 h1:7iP2uCb7sGddAr30RRS6xjKy7AZ2JtTOPA3oolgVSw8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0/go.mod h1:c7hN3ddxs/z6q9xwvfLPk+UHlWRQyaeR1LdgfL/66l0= -go.opentelemetry.io/otel v1.41.0 h1:YlEwVsGAlCvczDILpUXpIpPSL/VPugt7zHThEMLce1c= -go.opentelemetry.io/otel v1.41.0/go.mod h1:Yt4UwgEKeT05QbLwbyHXEwhnjxNO6D8L5PQP51/46dE= +go.opentelemetry.io/otel v1.41.1-0.20260304125011-e2305d228bc2 h1:JWMv8F/Kj1Cd6Etx+d5se9j0sVkLjV6Dh4SsUaRCP0w= +go.opentelemetry.io/otel v1.41.1-0.20260304125011-e2305d228bc2/go.mod h1:3aFZ+rUrAELOVa1rEO94NDjzbf9fVIhjRpj/ZX7tA/w= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 h1:lsInsfvhVIfOI6qHVyysXMNDnjO9Npvl7tlDPJFBVd4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0/go.mod h1:KQsVNh4OjgjTG0G6EiNi1jVpnaeeKsKMRwbLN+f1+8M= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= -go.opentelemetry.io/otel/metric v1.41.0 h1:rFnDcs4gRzBcsO9tS8LCpgR0dxg4aaxWlJxCno7JlTQ= -go.opentelemetry.io/otel/metric v1.41.0/go.mod h1:xPvCwd9pU0VN8tPZYzDZV/BMj9CM9vs00GuBjeKhJps= +go.opentelemetry.io/otel/metric v1.41.1-0.20260304125011-e2305d228bc2 h1:F3m5nPevzY1Yx9mfUyeKVdok1DBjY3Ed5Cn3Rz7r4OI= +go.opentelemetry.io/otel/metric v1.41.1-0.20260304125011-e2305d228bc2/go.mod h1:F3UaAQzxW1d7NnxfGtoFyXwrpDLVgXQvAKSSp6QjlR4= go.opentelemetry.io/otel/sdk v1.41.0 h1:YPIEXKmiAwkGl3Gu1huk1aYWwtpRLeskpV+wPisxBp8= go.opentelemetry.io/otel/sdk v1.41.0/go.mod h1:ahFdU0G5y8IxglBf0QBJXgSe7agzjE4GiTJ6HT9ud90= -go.opentelemetry.io/otel/sdk/metric v1.41.0 h1:siZQIYBAUd1rlIWQT2uCxWJxcCO7q3TriaMlf08rXw8= -go.opentelemetry.io/otel/sdk/metric v1.41.0/go.mod h1:HNBuSvT7ROaGtGI50ArdRLUnvRTRGniSUZbxiWxSO8Y= -go.opentelemetry.io/otel/trace v1.41.0 h1:Vbk2co6bhj8L59ZJ6/xFTskY+tGAbOnCtQGVVa9TIN0= -go.opentelemetry.io/otel/trace v1.41.0/go.mod h1:U1NU4ULCoxeDKc09yCWdWe+3QoyweJcISEVa1RBzOis= +go.opentelemetry.io/otel/sdk/metric v1.41.1-0.20260304125011-e2305d228bc2 h1:Quu+R3idalTXLp24BLvRWlsfQCE+UV2kQbU3WXQtKrc= +go.opentelemetry.io/otel/sdk/metric v1.41.1-0.20260304125011-e2305d228bc2/go.mod h1:3YZsZMqZuLJz7YK2vvcQ+2TtIkTt81rVDsgVJtT1+7o= +go.opentelemetry.io/otel/trace v1.41.1-0.20260304125011-e2305d228bc2 h1:BxHMb3yWJFkHKfLa79uXQh7aKpuldue1Diybj7IlXDY= +go.opentelemetry.io/otel/trace v1.41.1-0.20260304125011-e2305d228bc2/go.mod h1:cqXi+pwihSpIfBt0zxlxHRiZma5J0KTAyrd0wPvglbY= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.opentelemetry.io/proto/slim/otlp v1.9.0 h1:fPVMv8tP3TrsqlkH1HWYUpbCY9cAIemx184VGkS6vlE= diff --git a/processor/k8sattributesprocessor/internal/kube/client.go b/processor/k8sattributesprocessor/internal/kube/client.go index 5b06e686d311..00577358edc0 100644 --- a/processor/k8sattributesprocessor/internal/kube/client.go +++ b/processor/k8sattributesprocessor/internal/kube/client.go @@ -16,7 +16,7 @@ import ( "github.com/distribution/reference" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/attribute" - conventions "go.opentelemetry.io/otel/semconv/v1.39.0" + conventions "go.opentelemetry.io/otel/semconv/v1.40.0" "go.uber.org/zap" apps_v1 "k8s.io/api/apps/v1" batch_v1 "k8s.io/api/batch/v1" diff --git a/processor/k8sattributesprocessor/options.go b/processor/k8sattributesprocessor/options.go index 1a52efa39ac7..34a3a16a113e 100644 --- a/processor/k8sattributesprocessor/options.go +++ b/processor/k8sattributesprocessor/options.go @@ -8,7 +8,7 @@ import ( "regexp" "time" - conventions "go.opentelemetry.io/otel/semconv/v1.39.0" + conventions "go.opentelemetry.io/otel/semconv/v1.40.0" "k8s.io/apimachinery/pkg/selection" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" diff --git a/processor/k8sattributesprocessor/pod_association.go b/processor/k8sattributesprocessor/pod_association.go index ab55867e76e9..32e31ce2df7a 100644 --- a/processor/k8sattributesprocessor/pod_association.go +++ b/processor/k8sattributesprocessor/pod_association.go @@ -9,7 +9,7 @@ import ( "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/pdata/pcommon" - conventions "go.opentelemetry.io/otel/semconv/v1.39.0" + conventions "go.opentelemetry.io/otel/semconv/v1.40.0" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/clientutil" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor/internal/kube" diff --git a/processor/k8sattributesprocessor/processor.go b/processor/k8sattributesprocessor/processor.go index 1739dad42e57..c212806753d1 100644 --- a/processor/k8sattributesprocessor/processor.go +++ b/processor/k8sattributesprocessor/processor.go @@ -20,7 +20,7 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - conventions "go.opentelemetry.io/otel/semconv/v1.39.0" + conventions "go.opentelemetry.io/otel/semconv/v1.40.0" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig"