Skip to content

Commit 936253b

Browse files
committed
Update ec2tagger to support exp histograms
1 parent 2b0e2f2 commit 936253b

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

go.mod

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ go 1.24.4
44

55
replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.20250113150713-a2dfaa4cdf6d
66

7+
replace collectd.org v0.4.0 => github.com/collectd/go-collectd v0.4.0
8+
9+
replace code.cloudfoundry.org/clock => github.com/cloudfoundry/clock v1.0.0
10+
711
// Replace with https://github.com/amazon-contributing/opentelemetry-collector-contrib, there are no requirements for all receivers/processors/exporters
812
// to be all replaced since there are some changes that will always be from upstream
913
replace (
@@ -38,7 +42,10 @@ replace (
3842
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20250714154603-03b6f56bd5fb
3943
)
4044

41-
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20250714154603-03b6f56bd5fb
45+
replace (
46+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20250714154603-03b6f56bd5fb
47+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20250618011628-c38f9eb9d96a
48+
)
4249

4350
replace (
4451
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20250714154603-03b6f56bd5fb

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
4646
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
4747
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
4848
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
49-
code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o=
50-
code.cloudfoundry.org/clock v1.0.0/go.mod h1:QD9Lzhd/ux6eNQVUDVRJX/RKTigpewimNYBi7ivZKY8=
51-
collectd.org v0.4.0 h1:nWNldfMqg7EVWAevG8oyOVsS9r/UHRG3LZRf6MdQho0=
52-
collectd.org v0.4.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
5349
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
5450
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
5551
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
@@ -225,8 +221,10 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0
225221
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20250714154603-03b6f56bd5fb/go.mod h1:0uuvLgWcE6V7K7PyR7ohUtPPqaZB9RdTI8cJtkZAKKs=
226222
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20250714154603-03b6f56bd5fb h1:oZzrHzGhVLd/GG/1t9IyHh6D5TFSCTlWP3gWXhxz4rA=
227223
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20250714154603-03b6f56bd5fb/go.mod h1:7prJseoHF7mXXAPdU+q1zoZdVOclFZsgNhoBriqBIp0=
228-
github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20250714154603-03b6f56bd5fb h1:JbNLDUN3knMGyph+wQv2IRFznYP489XEQqfl5d86gyA=
229-
github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20250714154603-03b6f56bd5fb/go.mod h1:K8inysgi51ecddal8W6MPqrYcjh65wm1PsVDV+zgCEA=
224+
github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20250714154603-03b6f56bd5fb h1:ayrpH16LTMa2z95xBuaqXkR1V31nET2gxl0g9pYRQY8=
225+
github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20250714154603-03b6f56bd5fb/go.mod h1:fiFXubcxjqvUev4z0NXub109L2pk9hjGc5agEU03G0U=
226+
github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20250618011628-c38f9eb9d96a h1:fF0iYqtj26aEqq+6TwkA1PBtNkll2Jr0Wr9tOELCHMU=
227+
github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20250618011628-c38f9eb9d96a/go.mod h1:K8inysgi51ecddal8W6MPqrYcjh65wm1PsVDV+zgCEA=
230228
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20250714154603-03b6f56bd5fb h1:v6UOVy8nmTWUP4DYOrIFcMfFURAsAj7UcHHPSonZndg=
231229
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20250714154603-03b6f56bd5fb/go.mod h1:78qZtZnv6jO7K56d1OUMtgTcH0rPcb4N8Zp4/EiMJ0o=
232230
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20250714154603-03b6f56bd5fb h1:MBhMRXFk5tCo2rFXhhJh7jXuwoZzFV9lIRmf2wqzRDc=
@@ -398,6 +396,8 @@ github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5P
398396
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
399397
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY/k9Os/UFtwERei2/XzGemhpGnBKNg=
400398
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
399+
github.com/cloudfoundry/clock v1.0.0 h1:eKdoEckIniCXbwfL4u5BV+8TTiv/zkWLr8OdEfdkfJY=
400+
github.com/cloudfoundry/clock v1.0.0/go.mod h1:JXXHhAXLubRvUw6+f17a/0eNz6cQ85bkgYaiQA0Cm6M=
401401
github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
402402
github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
403403
github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
@@ -407,6 +407,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
407407
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
408408
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q6pvyM49i9XZAv9dDrkDA7gjk=
409409
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
410+
github.com/collectd/go-collectd v0.4.0 h1:0u1GXChSSlMw+riTADhcWwTjugckVWxjQHJi7Zj2Xe4=
411+
github.com/collectd/go-collectd v0.4.0/go.mod h1:xQe/Em/Q9IrN5ifWOvK5ZP2vMIB4KlsIA550yYzhkpY=
410412
github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0=
411413
github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0=
412414
github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
@@ -1266,8 +1268,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.124.1
12661268
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.124.1/go.mod h1:nWjjzGy7WQ/QntwK6dfCez419c+YATh6Heb9uKjjqp0=
12671269
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.124.1 h1:nE0KSsMpcrGjZKPSxyODDOC4GrgB4py05iROSu1DttI=
12681270
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.124.1/go.mod h1:ArRYQKGKS5qwsDbHawdlZBp6gnbfDnS95xg+GCmvzu8=
1269-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.124.1 h1:hNXho7StCk1/25/lvXaKzh4orvIMiv7faYT09pjs3F4=
1270-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.124.1/go.mod h1:fiFXubcxjqvUev4z0NXub109L2pk9hjGc5agEU03G0U=
12711271
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.124.0 h1:UdRBEFVFYfmGfJlgShpZ397HEsU0beYfnID4X/7q2GM=
12721272
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.124.0/go.mod h1:Om6rcy5yznIEMBhALY8C7tF2XTwnVp2Q0CYDmHWgnV8=
12731273
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.124.1 h1:/KYW+xicqDcNYJpv5H3BbPXw3oIBGaY8MMcdEg+ybW4=

plugins/processors/ec2tagger/ec2tagger.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ func getOtelAttributes(m pmetric.Metric) []pcommon.Map {
100100
for i := 0; i < dps.Len(); i++ {
101101
attributes = append(attributes, dps.At(i).Attributes())
102102
}
103+
case pmetric.MetricTypeExponentialHistogram:
104+
dps := m.ExponentialHistogram().DataPoints()
105+
for i := 0; i < dps.Len(); i++ {
106+
attributes = append(attributes, dps.At(i).Attributes())
107+
}
103108
}
104109
return attributes
105110
}

0 commit comments

Comments
 (0)