Skip to content

Commit 85d8a81

Browse files
shabichengshabicheng
committed
2 parents eaec232 + a1020fa commit 85d8a81

File tree

62 files changed

+890
-217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+890
-217
lines changed

‎exporter/awsxrayexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/golang/protobuf v1.3.5
99
github.com/mattn/go-isatty v0.0.10 // indirect
1010
github.com/stretchr/testify v1.5.1
11-
go.opentelemetry.io/collector v0.3.1-0.20200521001251-a02ed5c5a4a4
11+
go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65
1212
go.uber.org/zap v1.10.0
1313
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
1414
)

‎exporter/awsxrayexporter/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,8 +1232,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50=
12321232
go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
12331233
go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
12341234
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
1235-
go.opentelemetry.io/collector v0.3.1-0.20200521001251-a02ed5c5a4a4 h1:P0jgmNWAuPkYUi75foY7KWLXYVZLj9cVVp/Dg0ObBto=
1236-
go.opentelemetry.io/collector v0.3.1-0.20200521001251-a02ed5c5a4a4/go.mod h1:nMM1Y2O1LQXnJpUZhckT11nAxZ2K3ls/GO1acYOrFTQ=
1235+
go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65 h1:ObXizS60v/+eWWebUtS+14chMIWdq2eBv1C3JIUWOvA=
1236+
go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65/go.mod h1:rcMDg+njfS22WiT/MioZMNnGyXrxfsKXA2d6xxpnnfc=
12371237
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
12381238
go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
12391239
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1610,6 +1610,8 @@ k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010 h1:pyoq062NftC1y/OcnbSvgo
16101610
k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010/go.mod h1:Waf/xTS2FGRrgXCkO5FP3XxTOWh0qLf2QhL1qFZZ/R8=
16111611
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab h1:E8Fecph0qbNsAbijJJQryKu4Oi9QTp5cVpjTE+nqg6g=
16121612
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k=
1613+
k8s.io/client-go v12.0.0+incompatible h1:YlJxncpeVUC98/WMZKC3JZGk/OXQWCZjAB4Xr3B17RY=
1614+
k8s.io/client-go v12.0.0+incompatible/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k=
16131615
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
16141616
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
16151617
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

‎exporter/awsxrayexporter/translator/aws.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ func makeAws(attributes map[string]string, resource *resourcepb.Resource) (map[s
7777
container string
7878
namespace string
7979
deployID string
80-
ver string
8180
operation string
8281
remoteRegion string
8382
requestID string
@@ -162,7 +161,6 @@ func makeAws(attributes map[string]string, resource *resourcepb.Resource) (map[s
162161
}
163162
ebs = &BeanstalkMetadata{
164163
Environment: namespace,
165-
VersionLabel: ver,
166164
DeploymentID: deployNum,
167165
}
168166
}

‎exporter/awsxrayexporter/translator/aws_test.go

Lines changed: 18 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package translator
1616

1717
import (
18-
"strings"
1918
"testing"
2019

2120
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
@@ -44,13 +43,11 @@ func TestAwsFromEc2Resource(t *testing.T) {
4443
assert.NotNil(t, awsData.EC2Metadata)
4544
assert.Nil(t, awsData.ECSMetadata)
4645
assert.Nil(t, awsData.BeanstalkMetadata)
47-
w := testWriters.borrow()
48-
if err := w.Encode(awsData); err != nil {
49-
assert.Fail(t, "invalid json")
50-
}
51-
jsonStr := w.String()
52-
testWriters.release(w)
53-
assert.True(t, strings.Contains(jsonStr, instanceID))
46+
assert.Equal(t, "123456789", awsData.AccountID)
47+
assert.Equal(t, &EC2Metadata{
48+
InstanceID: instanceID,
49+
AvailabilityZone: "us-east-1c",
50+
}, awsData.EC2Metadata)
5451
}
5552

5653
func TestAwsFromEcsResource(t *testing.T) {
@@ -82,13 +79,9 @@ func TestAwsFromEcsResource(t *testing.T) {
8279
assert.NotNil(t, awsData.EC2Metadata)
8380
assert.NotNil(t, awsData.ECSMetadata)
8481
assert.Nil(t, awsData.BeanstalkMetadata)
85-
w := testWriters.borrow()
86-
if err := w.Encode(awsData); err != nil {
87-
assert.Fail(t, "invalid json")
88-
}
89-
jsonStr := w.String()
90-
testWriters.release(w)
91-
assert.True(t, strings.Contains(jsonStr, containerID))
82+
assert.Equal(t, &ECSMetadata{
83+
ContainerName: containerID,
84+
}, awsData.ECSMetadata)
9285
}
9386

9487
func TestAwsFromBeanstalkResource(t *testing.T) {
@@ -112,13 +105,11 @@ func TestAwsFromBeanstalkResource(t *testing.T) {
112105
assert.Nil(t, awsData.EC2Metadata)
113106
assert.Nil(t, awsData.ECSMetadata)
114107
assert.NotNil(t, awsData.BeanstalkMetadata)
115-
w := testWriters.borrow()
116-
if err := w.Encode(awsData); err != nil {
117-
assert.Fail(t, "invalid json")
118-
}
119-
jsonStr := w.String()
120-
testWriters.release(w)
121-
assert.True(t, strings.Contains(jsonStr, deployID))
108+
assert.Equal(t, &BeanstalkMetadata{
109+
Environment: "production",
110+
VersionLabel: "",
111+
DeploymentID: 232,
112+
}, awsData.BeanstalkMetadata)
122113
}
123114

124115
func TestAwsWithAwsSqsResources(t *testing.T) {
@@ -153,17 +144,8 @@ func TestAwsWithAwsSqsResources(t *testing.T) {
153144

154145
assert.NotNil(t, filtered)
155146
assert.NotNil(t, awsData)
156-
assert.NotNil(t, awsData.EC2Metadata)
157-
assert.NotNil(t, awsData.ECSMetadata)
158-
assert.Nil(t, awsData.BeanstalkMetadata)
159-
w := testWriters.borrow()
160-
if err := w.Encode(awsData); err != nil {
161-
assert.Fail(t, "invalid json")
162-
}
163-
jsonStr := w.String()
164-
testWriters.release(w)
165-
assert.True(t, strings.Contains(jsonStr, containerID))
166-
assert.True(t, strings.Contains(jsonStr, queueURL))
147+
assert.Equal(t, queueURL, awsData.QueueURL)
148+
assert.Equal(t, "us-east-2", awsData.RemoteRegion)
167149
}
168150

169151
func TestAwsWithSqsAlternateAttribute(t *testing.T) {
@@ -208,17 +190,9 @@ func TestAwsWithAwsDynamoDbResources(t *testing.T) {
208190

209191
assert.NotNil(t, filtered)
210192
assert.NotNil(t, awsData)
211-
assert.NotNil(t, awsData.EC2Metadata)
212-
assert.NotNil(t, awsData.ECSMetadata)
213-
assert.Nil(t, awsData.BeanstalkMetadata)
214-
w := testWriters.borrow()
215-
if err := w.Encode(awsData); err != nil {
216-
assert.Fail(t, "invalid json")
217-
}
218-
jsonStr := w.String()
219-
testWriters.release(w)
220-
assert.True(t, strings.Contains(jsonStr, containerID))
221-
assert.True(t, strings.Contains(jsonStr, tableName))
193+
assert.Equal(t, "PutItem", awsData.Operation)
194+
assert.Equal(t, "75107C82-EC8A-4F75-883F-4440B491B0AB", awsData.RequestID)
195+
assert.Equal(t, tableName, awsData.TableName)
222196
}
223197

224198
func TestAwsWithDynamoDbAlternateAttribute(t *testing.T) {

‎exporter/azuremonitorexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/golang/protobuf v1.3.5
1111
github.com/stretchr/testify v1.5.1
1212
github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
13-
go.opentelemetry.io/collector v0.3.1-0.20200521001251-a02ed5c5a4a4
13+
go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65
1414
go.uber.org/multierr v1.4.0 // indirect
1515
go.uber.org/zap v1.13.0
1616
google.golang.org/appengine v1.6.2 // indirect

‎exporter/azuremonitorexporter/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,8 +1133,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50=
11331133
go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
11341134
go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
11351135
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
1136-
go.opentelemetry.io/collector v0.3.1-0.20200521001251-a02ed5c5a4a4 h1:P0jgmNWAuPkYUi75foY7KWLXYVZLj9cVVp/Dg0ObBto=
1137-
go.opentelemetry.io/collector v0.3.1-0.20200521001251-a02ed5c5a4a4/go.mod h1:nMM1Y2O1LQXnJpUZhckT11nAxZ2K3ls/GO1acYOrFTQ=
1136+
go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65 h1:ObXizS60v/+eWWebUtS+14chMIWdq2eBv1C3JIUWOvA=
1137+
go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65/go.mod h1:rcMDg+njfS22WiT/MioZMNnGyXrxfsKXA2d6xxpnnfc=
11381138
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
11391139
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
11401140
go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY=
@@ -1515,6 +1515,8 @@ k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010 h1:pyoq062NftC1y/OcnbSvgo
15151515
k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010/go.mod h1:Waf/xTS2FGRrgXCkO5FP3XxTOWh0qLf2QhL1qFZZ/R8=
15161516
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab h1:E8Fecph0qbNsAbijJJQryKu4Oi9QTp5cVpjTE+nqg6g=
15171517
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k=
1518+
k8s.io/client-go v12.0.0+incompatible h1:YlJxncpeVUC98/WMZKC3JZGk/OXQWCZjAB4Xr3B17RY=
1519+
k8s.io/client-go v12.0.0+incompatible/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k=
15181520
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
15191521
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
15201522
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

‎exporter/carbonexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ go 1.14
55
require (
66
github.com/census-instrumentation/opencensus-proto v0.2.1
77
github.com/stretchr/testify v1.5.1
8-
go.opentelemetry.io/collector v0.3.1-0.20200521001251-a02ed5c5a4a4
8+
go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65
99
go.uber.org/zap v1.10.0
1010
)

‎exporter/carbonexporter/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,8 +1123,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50=
11231123
go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
11241124
go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
11251125
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
1126-
go.opentelemetry.io/collector v0.3.1-0.20200521001251-a02ed5c5a4a4 h1:P0jgmNWAuPkYUi75foY7KWLXYVZLj9cVVp/Dg0ObBto=
1127-
go.opentelemetry.io/collector v0.3.1-0.20200521001251-a02ed5c5a4a4/go.mod h1:nMM1Y2O1LQXnJpUZhckT11nAxZ2K3ls/GO1acYOrFTQ=
1126+
go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65 h1:ObXizS60v/+eWWebUtS+14chMIWdq2eBv1C3JIUWOvA=
1127+
go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65/go.mod h1:rcMDg+njfS22WiT/MioZMNnGyXrxfsKXA2d6xxpnnfc=
11281128
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
11291129
go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
11301130
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1487,6 +1487,8 @@ k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010 h1:pyoq062NftC1y/OcnbSvgo
14871487
k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010/go.mod h1:Waf/xTS2FGRrgXCkO5FP3XxTOWh0qLf2QhL1qFZZ/R8=
14881488
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab h1:E8Fecph0qbNsAbijJJQryKu4Oi9QTp5cVpjTE+nqg6g=
14891489
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k=
1490+
k8s.io/client-go v12.0.0+incompatible h1:YlJxncpeVUC98/WMZKC3JZGk/OXQWCZjAB4Xr3B17RY=
1491+
k8s.io/client-go v12.0.0+incompatible/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k=
14901492
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
14911493
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
14921494
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

‎exporter/honeycombexporter/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ The following configuration options are supported:
77
* `api_key` (Required): This is the API key (also called Write Key) for your Honeycomb account.
88
* `dataset` (Required): The Honeycomb dataset that you want to send events to.
99
* `api_url` (Optional): You can set the hostname to send events to. Useful for debugging, defaults to `https://api.honeycomb.io`
10+
* `sample_rate` (Optional): Constant sample rate. Can be used to send 1 / x events to Honeycomb. Defaults to 1 (always sample).
11+
* `debug` (Optional): Set this to true to get debug logs from the honeycomb SDK. Defaults to false.
1012
Example:
1113

1214
```yaml
@@ -15,4 +17,6 @@ exporters:
1517
api_key: "my-api-key"
1618
dataset: "my-dataset"
1719
api_url: "https://api.testhost.io"
20+
sample_rate: 25
21+
debug: true
1822
```

‎exporter/honeycombexporter/config.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,10 @@ type Config struct {
2424
Dataset string `mapstructure:"dataset"`
2525
// API URL to use (defaults to https://api.honeycomb.io)
2626
APIURL string `mapstructure:"api_url"`
27+
// SampleRate is the rate at which to sample this event. Default is 1,
28+
// meaning no sampling. If you want to send one event out of every 250
29+
// times Send() is called, you would specify 250 here.
30+
SampleRate uint `mapstructure:"sample_rate"`
31+
// Debug enables more verbose logging from the Honeycomb SDK. It defaults to false.
32+
Debug bool `mapstructure:"debug"`
2733
}

0 commit comments

Comments
 (0)