Add common signalfx host id extraction (#1100)

This adds a shared way to extract AWSUniqueId and gcp_id dimensions. It will be used by both sapmexporter and signalfxexporter. signalfxexporter cannot currently use the method because it's not on pdata and it seemed silly to unconvert metrics data back to pdata. I've added a note to signalfxexporter to use this common implementation once it switches to pdata.
asuresh4 · Sep 28, 2020 · 25ffd5a · 25ffd5a
1 parent e2bac01
commit 25ffd5a
Show file tree

Hide file tree

Showing 12 changed files with 1,776 additions and 46 deletions.
diff --git a/exporter/signalfxexporter/translation/converter.go b/exporter/signalfxexporter/translation/converter.go
@@ -416,6 +416,7 @@ func float64ToDimValue(f float64) string {
 // resource attributes, including a cloud host id (AWSUniqueId, gcp_id, etc.)
 // if it can be constructed from the provided metadata.
 func appendResourceAttributesToDimensions(dims []*sfxpb.Dimension, resourceAttr map[string]string) []*sfxpb.Dimension {
+ // TODO: Replace with internal/common/splunk/hostid.go once signalfxexporter is converted to pdata.
  accountID := resourceAttr[conventions.AttributeCloudAccount]
  region := resourceAttr[conventions.AttributeCloudRegion]
  instanceID := resourceAttr[conventions.AttributeHostID]

diff --git a/go.sum b/go.sum
@@ -171,6 +171,8 @@ github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/aws/aws-sdk-go v1.34.28 h1:sscPpn/Ns3i0F4HPEWAVcwdIRaZZCuL7llJ2/60yPIk=
+github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
 github.com/aws/aws-sdk-go v1.34.30 h1:izATc/E0+HcT5YHmaQVjn7GHCoqaBxn0PGo6Zq5UNFA=
 github.com/aws/aws-sdk-go v1.34.30/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
@@ -654,6 +656,7 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.14.5/go.mod h1:UJ0EZAp832vCd54Wev9N1BMKEyvcZ5+IM0AwDrnlkEc=
 github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw=
+github.com/grpc-ecosystem/grpc-gateway v1.14.8/go.mod h1:NZE8t6vs6TnwLL/ITkaK8W3ecMLGAbh2jXTclvpiwYo=
 github.com/grpc-ecosystem/grpc-gateway v1.15.0 h1:ntPNC9TD/6l2XDenJZe6T5lSMg95thpV9sGAqHX4WU8=
 github.com/grpc-ecosystem/grpc-gateway v1.15.0/go.mod h1:vO11I9oWA+KsxmfFQPhLnnIb1VDE24M+pdxZFiuZcA8=
 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
@@ -1341,6 +1344,11 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opentelemetry.io/collector v0.10.1-0.20200917170114-639b9a80ed46/go.mod h1:PFIDJqfiYoOFyOZTNczWwxzzV0D3rmITGXtG0UAt/ug=
+go.opentelemetry.io/collector v0.10.1-0.20200922190504-eb2127131b29 h1:IyZuEyIDj8I4YUKZF4EyOa3MPMMqSFEvqVLJ8J6zdvI=
+go.opentelemetry.io/collector v0.10.1-0.20200922190504-eb2127131b29/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
+go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
+go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
 go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
 go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
 go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E=
@@ -1855,7 +1863,6 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200603094226-e3079894b1e8/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v1.4.0/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=

diff --git a/internal/common/cloud/providers.go b/internal/common/cloud/providers.go
@@ -0,0 +1,22 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http:https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloud
+
+const (
+ // ProviderAWS is used in cloud.provider label for AWS.
+ ProviderAWS = "aws"
+ // ProviderGCP is used in cloud.provider label for GCP.
+ ProviderGCP = "gcp"
+)
diff --git a/internal/common/go.mod b/internal/common/go.mod
@@ -3,35 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/common
 go 1.14
 
 require (
- github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
- github.com/Microsoft/go-winio v0.4.14 // indirect
  github.com/cenkalti/backoff v2.2.1+incompatible
  github.com/containerd/containerd v1.3.6 // indirect
- github.com/docker/distribution v2.7.1+incompatible // indirect
- github.com/docker/docker v17.12.0-ce-rc1.0.20200514230353-811a247d06e8+incompatible
+ github.com/docker/docker v17.12.0-ce-rc1.0.20200706150819-a40b877fbb9e+incompatible
  github.com/docker/go-connections v0.4.0
- github.com/docker/go-units v0.4.0 // indirect
- github.com/gogo/protobuf v1.3.1 // indirect
- github.com/golang/protobuf v1.4.2 // indirect
- github.com/google/go-cmp v0.5.1 // indirect
- github.com/gorilla/mux v1.7.4 // indirect
- github.com/gotestyourself/gotestyourself v1.4.0 // indirect
- github.com/kr/text v0.2.0 // indirect
- github.com/morikuni/aec v1.0.0 // indirect
- github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
- github.com/opencontainers/go-digest v1.0.0 // indirect
- github.com/opencontainers/image-spec v1.0.1 // indirect
- github.com/pkg/errors v0.9.1 // indirect
- github.com/sirupsen/logrus v1.6.0 // indirect
  github.com/stretchr/testify v1.6.1
- golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
- golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
- golang.org/x/text v0.3.3 // indirect
- golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
- google.golang.org/genproto v0.0.0-20200624020401-64a14ca9d1ad // indirect
- google.golang.org/grpc v1.31.0 // indirect
- google.golang.org/protobuf v1.25.0 // indirect
- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
- gopkg.in/yaml.v3 v3.0.0-20200603094226-e3079894b1e8 // indirect
- gotest.tools v1.4.0 // indirect
+ go.opentelemetry.io/collector v0.11.0
 )