Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions .chloggen/k8sattr_semconv140.yaml
Original file line number Diff line number Diff line change
@@ -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: []
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions internal/datadog/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions internal/datadog/e2e/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion processor/k8sattributesprocessor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1114,4 +1114,4 @@ The breaking changes between the 2 schemas are the following:
- `k8s.namespace.annotations.<key>` -> `k8s.namespace.annotation.<key>`

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.
2 changes: 1 addition & 1 deletion processor/k8sattributesprocessor/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions processor/k8sattributesprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions processor/k8sattributesprocessor/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion processor/k8sattributesprocessor/internal/kube/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion processor/k8sattributesprocessor/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion processor/k8sattributesprocessor/pod_association.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion processor/k8sattributesprocessor/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading