Skip to content

Commit 009f434

Browse files
shabichengshabicheng
committed
refine code for ci
1 parent 85d8a81 commit 009f434

File tree

8 files changed

+27
-31
lines changed

8 files changed

+27
-31
lines changed

‎exporter/alibabacloudlogserviceexporter/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This exporter supports sending OpenTelemetry data to [LogService](https://www.al
44

55
Configuration options:
66

7-
- `endpoint` (required): Elastic APM Server URL.
7+
- `endpoint` (required): LogService's [Endpoint](https://www.alibabacloud.com/help/doc-detail/29008.htm).
88
- `project` (required): LogService's Project Name.
99
- `logstore` (required): LogService's Logstore Name.
1010
- `access_key_id` (optional): AlibabaCloud access key id.

‎exporter/alibabacloudlogserviceexporter/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type Config struct {
2828
// LogService's Logstore Name
2929
Logstore string `mapstructure:"logstore"`
3030
// AlibabaCloud access key id
31-
AccessKeyId string `mapstructure:"access_key_id"`
31+
AccessKeyID string `mapstructure:"access_key_id"`
3232
// AlibabaCloud access key secret
3333
AccessKeySecret string `mapstructure:"access_key_secret"`
3434
// Set AlibabaCLoud ECS ram role if you are using ACK

‎exporter/alibabacloudlogserviceexporter/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func TestLoadConfig(t *testing.T) {
5656
Endpoint: "cn-hangzhou.log.aliyuncs.com",
5757
Project: "demo-project",
5858
Logstore: "demo-logstore",
59-
AccessKeyId: "test-id",
59+
AccessKeyID: "test-id",
6060
AccessKeySecret: "test-secret",
6161
ECSRamRole: "test-role",
6262
MaxRetry: 10,

‎exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ package alibabacloudlogserviceexporter
1717
import (
1818
"context"
1919
"testing"
20+
"time"
2021

22+
metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
2123
"github.com/stretchr/testify/assert"
2224
"github.com/stretchr/testify/require"
2325
"go.opentelemetry.io/collector/consumer/consumerdata"
26+
"go.opentelemetry.io/collector/testutils/metricstestutils"
2427
"go.uber.org/zap"
2528
)
2629

@@ -34,8 +37,18 @@ func TestNewMetricsExporter(t *testing.T) {
3437
assert.NoError(t, err)
3538
require.NotNil(t, got)
3639

40+
unixSecs := int64(1574092046)
41+
unixNSecs := int64(11 * time.Millisecond)
42+
tsUnix := time.Unix(unixSecs, unixNSecs)
43+
44+
doubleVal := 1234.5678
45+
doublePt := metricstestutils.Double(tsUnix, doubleVal)
46+
3747
// This will put trace data to send buffer and return success.
38-
err = got.ConsumeMetricsData(context.Background(), consumerdata.MetricsData{})
48+
err = got.ConsumeMetricsData(context.Background(), consumerdata.MetricsData{
49+
Metrics: []*metricspb.Metric{
50+
metricstestutils.Gauge("gauge_double_with_dims", nil, metricstestutils.Timeseries(tsUnix, nil, doublePt)),
51+
}})
3952
assert.Nil(t, err)
4053
}
4154

‎exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ func (kv *KeyValues) labelToStringBuilder(sb *strings.Builder) {
107107
sb.WriteByte('|')
108108
}
109109
}
110-
return
111110
}
112111

113112
func newMetricLog(nsec int64,

‎exporter/alibabacloudlogserviceexporter/testdata/logservice_trace_data_no_binary_tags_02.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"Key": "reference",
59-
"Value": "[{\"TraceId\":\"000000000000000052969a8955571a3f\",\"SpanId\":\"0000000000647d98\",\"RefType\":\"PARENT_LINKED_SPAN\"},{\"TraceId\":\"000000000000000052969a8955571a3f\",\"SpanId\":\"000000000068c4e3\",\"RefType\":\"TYPE_UNSPECIFIED\"},{\"TraceId\":\"00000000000000000000000000000000\",\"SpanId\":\"0000000000000000\",\"RefType\":\"TYPE_UNSPECIFIED\"}]"
59+
"Value": "[{\"TraceID\":\"000000000000000052969a8955571a3f\",\"SpanID\":\"0000000000647d98\",\"RefType\":\"PARENT_LINKED_SPAN\"},{\"TraceID\":\"000000000000000052969a8955571a3f\",\"SpanID\":\"000000000068c4e3\",\"RefType\":\"TYPE_UNSPECIFIED\"},{\"TraceID\":\"00000000000000000000000000000000\",\"SpanID\":\"0000000000000000\",\"RefType\":\"TYPE_UNSPECIFIED\"}]"
6060
},
6161
{
6262
"Key": "parentSpanID",

‎exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
)
3333

3434
const (
35-
unknownProcessName = "unknown-service-name"
3635
traceIDField = "traceID"
3736
spanIDField = "spanID"
3837
parentSpanIDField = "parentSpanID"
@@ -71,11 +70,7 @@ func traceDataToLogServiceData(td consumerdata.TraceData) ([]*sls.Log, error) {
7170

7271
func nodeAndResourceToLogContent(node *commonpb.Node, resource *resourcepb.Resource) []*sls.LogContent {
7372
if node == nil {
74-
// Jaeger requires a non-nil Process
75-
return []*sls.LogContent{&sls.LogContent{
76-
Key: proto.String(serviceNameField),
77-
Value: proto.String(unknownProcessName),
78-
}}
73+
return []*sls.LogContent{}
7974
}
8075

8176
var contents []*sls.LogContent
@@ -279,16 +274,16 @@ func linksToLogContents(ocSpanLinks *tracepb.Span_Links) (*sls.LogContent, error
279274
ocLinks := ocSpanLinks.Link
280275

281276
type linkSpanRef struct {
282-
TraceId string
283-
SpanId string
277+
TraceID string
278+
SpanID string
284279
RefType string
285280
}
286281
spanRefs := make([]linkSpanRef, 0, len(ocLinks))
287282

288283
for _, ocLink := range ocLinks {
289284
spanRefs = append(spanRefs, linkSpanRef{
290-
TraceId: hex.EncodeToString(ocLink.TraceId[:]),
291-
SpanId: hex.EncodeToString(ocLink.SpanId[:]),
285+
TraceID: hex.EncodeToString(ocLink.TraceId[:]),
286+
SpanID: hex.EncodeToString(ocLink.SpanId[:]),
292287
RefType: ocLink.GetType().String(),
293288
})
294289
}

‎exporter/alibabacloudlogserviceexporter/uploader.go

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,14 @@ type callback struct {
2929
}
3030

3131
func (callback *callback) Success(result *producer.Result) {
32-
// For better performance, disable all logs when send success
33-
//callback.logger.Debug("send to log service success", zap.String("requestId", result.GetRequestId()))
3432
}
3533

3634
func (callback *callback) Fail(result *producer.Result) {
37-
callback.logger.Warn("send to log service failed",
38-
zap.String("requestId", result.GetRequestId()),
39-
zap.String("errorCode", result.GetErrorCode()),
40-
zap.String("errorMessage", result.GetErrorMessage()))
35+
callback.logger.Warn("send to log service failed", zap.String("requestId", result.GetRequestId()), zap.String("errorCode", result.GetErrorCode()), zap.String("errorMessage", result.GetErrorMessage()))
4136
}
4237

4338
// Producer log Service's producer wrapper
4439
type Producer interface {
45-
CloseProducer() error
4640
SendLogs(logs []*sls.Log) error
4741
}
4842

@@ -100,7 +94,7 @@ func NewProducer(config *Config, logger *zap.Logger) (Producer, error) {
10094
// Retrieve Log Service Configuration Details
10195
producerConfig := producer.GetDefaultProducerConfig()
10296
producerConfig.Endpoint = config.Endpoint
103-
producerConfig.AccessKeyID = config.AccessKeyId
97+
producerConfig.AccessKeyID = config.AccessKeyID
10498
producerConfig.AccessKeySecret = config.AccessKeySecret
10599

106100
if config.MaxRetry > 0 {
@@ -121,22 +115,17 @@ func NewProducer(config *Config, logger *zap.Logger) (Producer, error) {
121115
// do not return error if get hostname or ip address fail
122116
var err error
123117
if p.topic, err = os.Hostname(); err != nil {
124-
// log error
118+
logger.Warn("Get hostname error when create LogService producer", zap.Error(err))
125119
}
126120
if p.source, err = getIPAddress(); err != nil {
127-
// log error
121+
logger.Warn("Get IP address error when create LogService producer", zap.Error(err))
128122
}
129123
p.logger = logger
130124
logger.Info("Create LogService producer success", zap.String("project", config.Project), zap.String("logstore", config.Logstore))
131125

132126
return p, nil
133127
}
134128

135-
// CloseProducer Close Producer Instance
136-
func (producerInstance *producerImpl) CloseProducer() error {
137-
return producerInstance.producerInstance.Close(6000)
138-
}
139-
140129
// SendMessage Send message to LogService
141130
func (producerInstance *producerImpl) SendLogs(logs []*sls.Log) error {
142131
return producerInstance.producerInstance.SendLogListWithCallBack(

0 commit comments

Comments
 (0)