Skip to content

Commit d387e0a

Browse files
rafaelwestphalrafaelwestphal
committed
Added metricstarttime exporter to the end of the pipelines
1 parent 936ae3d commit d387e0a

6 files changed

Lines changed: 68 additions & 34 deletions

File tree

‎confgenerator/confgenerator.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -317,14 +317,6 @@ func (p PipelineInstance) OTelComponents(ctx context.Context) (map[string]otel.R
317317
)
318318
}
319319

320-
expOtlpExporter := experimentsFromContext(ctx)["otlp_exporter"]
321-
if processors, ok := receiverPipeline.Processors["metrics"]; ok && expOtlpExporter {
322-
receiverPipeline.Processors["metrics"] = append(
323-
processors,
324-
otelSetOtlpExporterComponents()...,
325-
)
326-
}
327-
328320
outR[receiverPipelineName] = receiverPipeline
329321

330322
pipeline := otel.Pipeline{

‎confgenerator/otel/modular.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,12 @@ func (c ModularConfig) Generate(ctx context.Context, expOtlpExporter bool) (stri
256256
copyProcessor := CopyHostIDToInstanceID()
257257
processorNames = append(processorNames, copyProcessor.name("_global_0"))
258258
processors[copyProcessor.name("_global_0")] = copyProcessor.Config
259+
// Similar to the resource detector, for any pipeline that is using the
260+
// otlphttp exporter, we add a MetricStartTime processor at the end of it.
261+
// This mimics the current behavior on GCM exporter.
262+
metricStartTime := MetricStartTime()
263+
processorNames = append(processorNames, metricStartTime.name(fmt.Sprintf("%s_0", prefix)))
264+
processors[metricStartTime.name(fmt.Sprintf("%s_0", prefix))] = metricStartTime.Config
259265
}
260266
}
261267
exporterType := receiverPipeline.ExporterTypes[pipeline.Type]

‎confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,17 @@ processors:
8686
- googlecloudmonitoring/point_count
8787
interval/loggingmetrics_7:
8888
interval: 1m
89-
metricstarttime/hostmetrics_1_1:
89+
metricstarttime/default__pipeline_hostmetrics_0:
9090
strategy: subtract_initial_point
91-
metricstarttime/hostmetrics_3:
91+
metricstarttime/default__pipeline_hostmetrics_1_0:
9292
strategy: subtract_initial_point
93-
metricstarttime/prometheus_3:
93+
metricstarttime/fluentbit_0:
94+
strategy: subtract_initial_point
95+
metricstarttime/loggingmetrics_0:
96+
strategy: subtract_initial_point
97+
metricstarttime/opsagent_0:
98+
strategy: subtract_initial_point
99+
metricstarttime/otel_0:
94100
strategy: subtract_initial_point
95101
metricstransform/fluentbit_1:
96102
transforms:
@@ -792,21 +798,21 @@ service:
792798
- agentmetrics/hostmetrics_0
793799
- filter/hostmetrics_1
794800
- metricstransform/hostmetrics_2
795-
- metricstarttime/hostmetrics_3
796801
- filter/default__pipeline_hostmetrics_0
797802
- resourcedetection/_global_0
798803
- transform/_global_0
804+
- metricstarttime/default__pipeline_hostmetrics_0
799805
receivers:
800806
- hostmetrics/hostmetrics
801807
metrics/default__pipeline_hostmetrics_1:
802808
exporters:
803809
- googlecloud
804810
processors:
805811
- metricstransform/hostmetrics_1_0
806-
- metricstarttime/hostmetrics_1_1
807812
- filter/default__pipeline_hostmetrics_1_0
808813
- resourcedetection/_global_0
809814
- transform/_global_0
815+
- metricstarttime/default__pipeline_hostmetrics_1_0
810816
receivers:
811817
- nvml/hostmetrics_1
812818
metrics/fluentbit:
@@ -820,6 +826,7 @@ service:
820826
- metricstransform/fluentbit_1
821827
- resourcedetection/_global_0
822828
- transform/_global_0
829+
- metricstarttime/fluentbit_0
823830
receivers:
824831
- prometheus/agent_prometheus
825832
metrics/loggingmetrics:
@@ -840,6 +847,7 @@ service:
840847
- metricstransform/loggingmetrics_8
841848
- resourcedetection/_global_0
842849
- transform/_global_0
850+
- metricstarttime/loggingmetrics_0
843851
receivers:
844852
- prometheus/agent_prometheus
845853
metrics/opsagent:
@@ -851,6 +859,7 @@ service:
851859
- transform/ops_agent_2
852860
- resourcedetection/_global_0
853861
- transform/_global_0
862+
- metricstarttime/opsagent_0
854863
receivers:
855864
- otlpjsonfile/ops_agent
856865
metrics/otel:
@@ -866,6 +875,7 @@ service:
866875
- metricstransform/otel_3
867876
- resourcedetection/_global_0
868877
- transform/_global_0
878+
- metricstarttime/otel_0
869879
receivers:
870880
- prometheus/agent_prometheus
871881
metrics/prometheus__pipeline_prometheus:
@@ -875,7 +885,6 @@ service:
875885
- transform/prometheus_0
876886
- resource/prometheus_1
877887
- transform/prometheus_2
878-
- metricstarttime/prometheus_3
879888
receivers:
880889
- prometheus/prometheus
881890
telemetry:

‎confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,15 @@ processors:
8181
- googlecloudmonitoring/point_count
8282
interval/loggingmetrics_7:
8383
interval: 1m
84-
metricstarttime/hostmetrics_3:
84+
metricstarttime/default__pipeline_hostmetrics_0:
8585
strategy: subtract_initial_point
86-
metricstarttime/prometheus_3:
86+
metricstarttime/fluentbit_0:
87+
strategy: subtract_initial_point
88+
metricstarttime/loggingmetrics_0:
89+
strategy: subtract_initial_point
90+
metricstarttime/opsagent_0:
91+
strategy: subtract_initial_point
92+
metricstarttime/otel_0:
8793
strategy: subtract_initial_point
8894
metricstransform/fluentbit_1:
8995
transforms:
@@ -759,10 +765,10 @@ service:
759765
- agentmetrics/hostmetrics_0
760766
- filter/hostmetrics_1
761767
- metricstransform/hostmetrics_2
762-
- metricstarttime/hostmetrics_3
763768
- filter/default__pipeline_hostmetrics_0
764769
- resourcedetection/_global_0
765770
- transform/_global_0
771+
- metricstarttime/default__pipeline_hostmetrics_0
766772
receivers:
767773
- hostmetrics/hostmetrics
768774
metrics/fluentbit:
@@ -776,6 +782,7 @@ service:
776782
- metricstransform/fluentbit_1
777783
- resourcedetection/_global_0
778784
- transform/_global_0
785+
- metricstarttime/fluentbit_0
779786
receivers:
780787
- prometheus/agent_prometheus
781788
metrics/loggingmetrics:
@@ -796,6 +803,7 @@ service:
796803
- metricstransform/loggingmetrics_8
797804
- resourcedetection/_global_0
798805
- transform/_global_0
806+
- metricstarttime/loggingmetrics_0
799807
receivers:
800808
- prometheus/agent_prometheus
801809
metrics/opsagent:
@@ -807,6 +815,7 @@ service:
807815
- transform/ops_agent_2
808816
- resourcedetection/_global_0
809817
- transform/_global_0
818+
- metricstarttime/opsagent_0
810819
receivers:
811820
- otlpjsonfile/ops_agent
812821
metrics/otel:
@@ -822,6 +831,7 @@ service:
822831
- metricstransform/otel_3
823832
- resourcedetection/_global_0
824833
- transform/_global_0
834+
- metricstarttime/otel_0
825835
receivers:
826836
- prometheus/agent_prometheus
827837
metrics/prometheus__pipeline_prometheus:
@@ -831,7 +841,6 @@ service:
831841
- transform/prometheus_0
832842
- resource/prometheus_1
833843
- transform/prometheus_2
834-
- metricstarttime/prometheus_3
835844
receivers:
836845
- prometheus/prometheus
837846
telemetry:

‎confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,19 @@ processors:
9696
- googlecloudmonitoring/point_count
9797
interval/loggingmetrics_7:
9898
interval: 1m
99-
metricstarttime/hostmetrics_3:
99+
metricstarttime/default__pipeline_hostmetrics_0:
100100
strategy: subtract_initial_point
101-
metricstarttime/iis_5:
101+
metricstarttime/default__pipeline_iis_0:
102102
strategy: subtract_initial_point
103-
metricstarttime/mssql_3:
103+
metricstarttime/default__pipeline_mssql_0:
104104
strategy: subtract_initial_point
105-
metricstarttime/prometheus_3:
105+
metricstarttime/fluentbit_0:
106+
strategy: subtract_initial_point
107+
metricstarttime/loggingmetrics_0:
108+
strategy: subtract_initial_point
109+
metricstarttime/opsagent_0:
110+
strategy: subtract_initial_point
111+
metricstarttime/otel_0:
106112
strategy: subtract_initial_point
107113
metricstransform/fluentbit_1:
108114
transforms:
@@ -886,10 +892,10 @@ service:
886892
- agentmetrics/hostmetrics_0
887893
- filter/hostmetrics_1
888894
- metricstransform/hostmetrics_2
889-
- metricstarttime/hostmetrics_3
890895
- filter/default__pipeline_hostmetrics_0
891896
- resourcedetection/_global_0
892897
- transform/_global_0
898+
- metricstarttime/default__pipeline_hostmetrics_0
893899
receivers:
894900
- hostmetrics/hostmetrics
895901
metrics/default__pipeline_iis:
@@ -901,10 +907,10 @@ service:
901907
- normalizesums/iis_2
902908
- transform/iis_3
903909
- resource/iis_4
904-
- metricstarttime/iis_5
905910
- filter/default__pipeline_iis_0
906911
- resourcedetection/_global_0
907912
- transform/_global_0
913+
- metricstarttime/default__pipeline_iis_0
908914
receivers:
909915
- windowsperfcounters/iis
910916
metrics/default__pipeline_mssql:
@@ -914,10 +920,10 @@ service:
914920
- metricstransform/mssql_0
915921
- transform/mssql_1
916922
- resource/mssql_2
917-
- metricstarttime/mssql_3
918923
- filter/default__pipeline_mssql_0
919924
- resourcedetection/_global_0
920925
- transform/_global_0
926+
- metricstarttime/default__pipeline_mssql_0
921927
receivers:
922928
- windowsperfcounters/mssql
923929
metrics/fluentbit:
@@ -931,6 +937,7 @@ service:
931937
- metricstransform/fluentbit_1
932938
- resourcedetection/_global_0
933939
- transform/_global_0
940+
- metricstarttime/fluentbit_0
934941
receivers:
935942
- prometheus/agent_prometheus
936943
metrics/loggingmetrics:
@@ -951,6 +958,7 @@ service:
951958
- metricstransform/loggingmetrics_8
952959
- resourcedetection/_global_0
953960
- transform/_global_0
961+
- metricstarttime/loggingmetrics_0
954962
receivers:
955963
- prometheus/agent_prometheus
956964
metrics/opsagent:
@@ -962,6 +970,7 @@ service:
962970
- transform/ops_agent_2
963971
- resourcedetection/_global_0
964972
- transform/_global_0
973+
- metricstarttime/opsagent_0
965974
receivers:
966975
- otlpjsonfile/ops_agent
967976
metrics/otel:
@@ -977,6 +986,7 @@ service:
977986
- metricstransform/otel_3
978987
- resourcedetection/_global_0
979988
- transform/_global_0
989+
- metricstarttime/otel_0
980990
receivers:
981991
- prometheus/agent_prometheus
982992
metrics/prometheus__pipeline_prometheus:
@@ -986,7 +996,6 @@ service:
986996
- transform/prometheus_0
987997
- resource/prometheus_1
988998
- transform/prometheus_2
989-
- metricstarttime/prometheus_3
990999
receivers:
9911000
- prometheus/prometheus
9921001
telemetry:

‎confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,19 @@ processors:
9696
- googlecloudmonitoring/point_count
9797
interval/loggingmetrics_7:
9898
interval: 1m
99-
metricstarttime/hostmetrics_3:
99+
metricstarttime/default__pipeline_hostmetrics_0:
100100
strategy: subtract_initial_point
101-
metricstarttime/iis_5:
101+
metricstarttime/default__pipeline_iis_0:
102102
strategy: subtract_initial_point
103-
metricstarttime/mssql_3:
103+
metricstarttime/default__pipeline_mssql_0:
104104
strategy: subtract_initial_point
105-
metricstarttime/prometheus_3:
105+
metricstarttime/fluentbit_0:
106+
strategy: subtract_initial_point
107+
metricstarttime/loggingmetrics_0:
108+
strategy: subtract_initial_point
109+
metricstarttime/opsagent_0:
110+
strategy: subtract_initial_point
111+
metricstarttime/otel_0:
106112
strategy: subtract_initial_point
107113
metricstransform/fluentbit_1:
108114
transforms:
@@ -886,10 +892,10 @@ service:
886892
- agentmetrics/hostmetrics_0
887893
- filter/hostmetrics_1
888894
- metricstransform/hostmetrics_2
889-
- metricstarttime/hostmetrics_3
890895
- filter/default__pipeline_hostmetrics_0
891896
- resourcedetection/_global_0
892897
- transform/_global_0
898+
- metricstarttime/default__pipeline_hostmetrics_0
893899
receivers:
894900
- hostmetrics/hostmetrics
895901
metrics/default__pipeline_iis:
@@ -901,10 +907,10 @@ service:
901907
- normalizesums/iis_2
902908
- transform/iis_3
903909
- resource/iis_4
904-
- metricstarttime/iis_5
905910
- filter/default__pipeline_iis_0
906911
- resourcedetection/_global_0
907912
- transform/_global_0
913+
- metricstarttime/default__pipeline_iis_0
908914
receivers:
909915
- windowsperfcounters/iis
910916
metrics/default__pipeline_mssql:
@@ -914,10 +920,10 @@ service:
914920
- metricstransform/mssql_0
915921
- transform/mssql_1
916922
- resource/mssql_2
917-
- metricstarttime/mssql_3
918923
- filter/default__pipeline_mssql_0
919924
- resourcedetection/_global_0
920925
- transform/_global_0
926+
- metricstarttime/default__pipeline_mssql_0
921927
receivers:
922928
- windowsperfcounters/mssql
923929
metrics/fluentbit:
@@ -931,6 +937,7 @@ service:
931937
- metricstransform/fluentbit_1
932938
- resourcedetection/_global_0
933939
- transform/_global_0
940+
- metricstarttime/fluentbit_0
934941
receivers:
935942
- prometheus/agent_prometheus
936943
metrics/loggingmetrics:
@@ -951,6 +958,7 @@ service:
951958
- metricstransform/loggingmetrics_8
952959
- resourcedetection/_global_0
953960
- transform/_global_0
961+
- metricstarttime/loggingmetrics_0
954962
receivers:
955963
- prometheus/agent_prometheus
956964
metrics/opsagent:
@@ -962,6 +970,7 @@ service:
962970
- transform/ops_agent_2
963971
- resourcedetection/_global_0
964972
- transform/_global_0
973+
- metricstarttime/opsagent_0
965974
receivers:
966975
- otlpjsonfile/ops_agent
967976
metrics/otel:
@@ -977,6 +986,7 @@ service:
977986
- metricstransform/otel_3
978987
- resourcedetection/_global_0
979988
- transform/_global_0
989+
- metricstarttime/otel_0
980990
receivers:
981991
- prometheus/agent_prometheus
982992
metrics/prometheus__pipeline_prometheus:
@@ -986,7 +996,6 @@ service:
986996
- transform/prometheus_0
987997
- resource/prometheus_1
988998
- transform/prometheus_2
989-
- metricstarttime/prometheus_3
990999
receivers:
9911000
- prometheus/prometheus
9921001
telemetry:

0 commit comments

Comments
 (0)