alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use new metrics API for s3 log metrics (#680)

Browse Source 
* use new metrics API for histogram metrics

* Avoid creating an extra tracing span

* use new metrics api for histograms

* fix minor formatting issue
This commit is contained in:
Gerardo Viedma
2018-01-15 10:09:03 +00:00
committed by Nigel Deakin
parent e89fb179dc
commit 966ce58525
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/logs/s3/s3.go
View File

@@ -17,9 +17,9 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/fnproject/fn/api/common"
"github.com/fnproject/fn/api/models"
"github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/log"
"github.com/sirupsen/logrus"
)
@@ -144,7 +144,7 @@ func (s *store) InsertLog(ctx context.Context, appName, callID string, callLog i
return fmt.Errorf("failed to write log, %v", err)
}
span.LogFields(log.Int("fn_s3_log_upload_size", cr.count))
common.PublishHistogramToSpan(span, "s3_log_upload_size", float64(cr.count))
return nil
}
@@ -169,6 +169,6 @@ func (s *store) GetLog(ctx context.Context, appName, callID string) (io.Reader,
return nil, fmt.Errorf("failed to read log, %v", err)
}
span.LogFields(log.Int64("fn_s3_log_download_size", size))
common.PublishHistogramToSpan(span, "s3_log_download_size", float64(size))
return bytes.NewReader(target.Bytes()), nil
}