Skip to content
Open
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
30 changes: 30 additions & 0 deletions .chloggen/erw_metricstarttime_k8s_attrs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 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/metricstarttime

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: add a new `starttimeattribute` strategy to the metricstarttime processor

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [43739]

# (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:
add new `starttimeattribute` strategy to use pod start time (or pod containersready time) as ST \
allow all strategies to only apply to filtered metrics \
allow all strategies to skip metrics with CTs already set

# 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: []
12 changes: 11 additions & 1 deletion processor/metricstarttimeprocessor/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (

"go.opentelemetry.io/collector/component"

"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/filter"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/starttimeattribute"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/starttimemetric"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/subtractinitial"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/truereset"
Expand All @@ -21,7 +23,14 @@ type Config struct {
Strategy string `mapstructure:"strategy"`
GCInterval time.Duration `mapstructure:"gc_interval"`
// StartTimeMetricRegex only applies then the start_time_metric strategy is used
StartTimeMetricRegex string `mapstructure:"start_time_metric_regex"`
StartTimeMetricRegex string `mapstructure:"start_time_metric_regex"`
IncludeMetrics filter.FilterConfig `mapstructure:"include_metrics"`
ExcludeMetrics filter.FilterConfig `mapstructure:"exclude_metrics"`
// AttributesFilters only applies to the start_time_attribute strategy to construct specific k8s api informer filters
AttributesFilters starttimeattribute.AttributesFilterConfig `mapstructure:"attributes_filters"`
SkipIfCTExists bool `mapstructure:"skip_if_ct_exists"`

UseContainerReadinessTime bool `mapstructure:"use_container_readiness_time"`
}

var _ component.Config = (*Config)(nil)
Expand All @@ -39,6 +48,7 @@ func (cfg *Config) Validate() error {
case truereset.Type:
case subtractinitial.Type:
case starttimemetric.Type:
case starttimeattribute.Type:
default:
return fmt.Errorf("%q is not a valid strategy", cfg.Strategy)
}
Expand Down
25 changes: 21 additions & 4 deletions processor/metricstarttimeprocessor/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import (
"go.opentelemetry.io/collector/processor"
"go.opentelemetry.io/collector/processor/processorhelper"

"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/common"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/filter"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/starttimeattribute"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/starttimemetric"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/subtractinitial"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor/internal/truereset"
Expand All @@ -34,15 +37,23 @@ func createMetricsProcessor(
nextConsumer consumer.Metrics,
) (processor.Metrics, error) {
rCfg := cfg.(*Config)

filter, err := filter.NewFilter(rCfg.IncludeMetrics, rCfg.ExcludeMetrics)
if err != nil {
return nil, err
}
opts := common.AdjustmentOptions{
GCInterval: rCfg.GCInterval,
SkipIfCTExists: rCfg.SkipIfCTExists,
Filter: filter,
}
var adjustMetrics processorhelper.ProcessMetricsFunc

switch rCfg.Strategy {
case truereset.Type:
adjuster := truereset.NewAdjuster(set.TelemetrySettings, rCfg.GCInterval)
adjuster := truereset.NewAdjuster(set.TelemetrySettings, opts)
adjustMetrics = adjuster.AdjustMetrics
case subtractinitial.Type:
adjuster := subtractinitial.NewAdjuster(set.TelemetrySettings, rCfg.GCInterval)
adjuster := subtractinitial.NewAdjuster(set.TelemetrySettings, opts)
adjustMetrics = adjuster.AdjustMetrics
case starttimemetric.Type:
var startTimeMetricRegex *regexp.Regexp
Expand All @@ -53,7 +64,13 @@ func createMetricsProcessor(
return nil, err
}
}
adjuster := starttimemetric.NewAdjuster(set.TelemetrySettings, startTimeMetricRegex, rCfg.GCInterval)
adjuster := starttimemetric.NewAdjuster(set.TelemetrySettings, startTimeMetricRegex, opts)
adjustMetrics = adjuster.AdjustMetrics
case starttimeattribute.Type:
adjuster, err := starttimeattribute.NewAdjuster(set.TelemetrySettings, rCfg.AttributesFilters, rCfg.UseContainerReadinessTime, opts)
if err != nil {
return nil, err
}
adjustMetrics = adjuster.AdjustMetrics
}

Expand Down
52 changes: 47 additions & 5 deletions processor/metricstarttimeprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/metri
go 1.24.0

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.138.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.138.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.138.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.138.0
github.com/stretchr/testify v1.11.1
Expand All @@ -19,27 +21,48 @@ require (
go.opentelemetry.io/otel v1.38.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
k8s.io/api v0.32.3
k8s.io/apimachinery v0.32.3
k8s.io/client-go v0.32.3
)

require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/knadh/koanf/maps v0.1.2 // indirect
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
github.com/knadh/koanf/v2 v2.3.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/openshift/api v3.9.0+incompatible // indirect
github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.138.1-0.20251021231522-c657d5d4e920 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.138.1-0.20251021231522-c657d5d4e920 // indirect
Expand All @@ -57,17 +80,36 @@ require (
go.opentelemetry.io/otel/trace v1.38.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/net v0.42.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/text v0.27.0 // indirect
golang.org/x/net v0.44.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sys v0.36.0 // indirect
golang.org/x/term v0.35.0 // indirect
golang.org/x/text v0.29.0 // indirect
golang.org/x/time v0.7.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
google.golang.org/grpc v1.76.0 // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ./../../internal/k8sconfig

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter => ../../internal/filter

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl => ../../pkg/ottl

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
Loading