Merge pull request #44 from reproio/featdisable-submitting-metrics

support disabling to submit request count metrics
reproio · Jan 19, 2024 · 5de8038 · 5de8038
2 parents 8c6a684 + 2f8beba
commit 5de8038
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,19 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+      - uses: actions/checkout@v4
+      - run: make build
+      - run: make test
diff --git a/metrics_submitter.go b/metrics_submitter.go
@@ -43,7 +43,7 @@ func (p *MetricsSubmitter) Submit(metrics map[string]*Metric, s3ObjectKey string
 		}
 
 		distributionPointPayload := datadogV1.DistributionPointsPayload{}
-		s, err := p.targetProcessingTime(metric)
+		s, err := p.targetProcessingTime(metric, s3ObjectKey)
 		if err != nil {
 			return err
 		}
@@ -59,15 +59,17 @@ func (p *MetricsSubmitter) Submit(metrics map[string]*Metric, s3ObjectKey string
 			return nil
 		})
 
-		eg.Go(func() error {
-			_, r, err := v2Api.SubmitMetrics(ctx, metricsPayload, *datadogV2.NewSubmitMetricsOptionalParameters())
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "Error when calling `MetricsApi.SubmitMetrics`: %v\n", err)
-				fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
-				return err
-			}
-			return nil
-		})
+		if p.requestCountMetricName != "" {
+			eg.Go(func() error {
+				_, r, err := v2Api.SubmitMetrics(ctx, metricsPayload, *datadogV2.NewSubmitMetricsOptionalParameters())
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "Error when calling `MetricsApi.SubmitMetrics`: %v\n", err)
+					fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+					return err
+				}
+				return nil
+			})
+		}
 	}
 
 	if err := eg.Wait(); err != nil {
@@ -105,7 +107,7 @@ func (p *MetricsSubmitter) requestCountSeries(metric *Metric, s3ObjectKey string
 	return *series
 }
 
-func (p *MetricsSubmitter) targetProcessingTime(metric *Metric) ([]datadogV1.DistributionPointsSeries, error) {
+func (p *MetricsSubmitter) targetProcessingTime(metric *Metric, s3ObjectKey string) ([]datadogV1.DistributionPointsSeries, error) {
 	seriesSlice := make([]datadogV1.DistributionPointsSeries, 1)
 	points := make([][]datadogV1.DistributionPointItem, 0, len(metric.TargetProcessingTimesMap))
 
@@ -125,6 +127,7 @@ func (p *MetricsSubmitter) targetProcessingTime(metric *Metric) ([]datadogV1.Dis
 		fmt.Sprintf("elb_status_code:%s", metric.ElbStatusCode),
 		fmt.Sprintf("target_status_code:%s", metric.TargetStatusCode),
 		fmt.Sprintf("target_status_code_group:%s", metric.TargetStatusCodeGroup()),
+		fmt.Sprintf("ip_address:%s", p.loadBalancerIpAddress(s3ObjectKey)),
 	}
 	for _, tag := range p.customTags {
 		tags = append(tags, fmt.Sprintf("%s:%s", tag.Name, tag.Key()))

diff --git a/metrics_submitter_test.go b/metrics_submitter_test.go
@@ -105,6 +105,7 @@ func TestMetricsSubmitter_targetProcessingTime(t *testing.T) {
 						"elb_status_code:200",
 						"target_status_code:200",
 						"target_status_code_group:2xx",
+						"ip_address:172.160.001.192",
 					},
 					Type: &typeVar,
 				},
@@ -119,7 +120,7 @@ func TestMetricsSubmitter_targetProcessingTime(t *testing.T) {
 				targetProcessingTimeMetricName: tt.fields.TargetProcessingTimeMetricName,
 				customTags:                     tt.fields.CustomTags,
 			}
-			got, err := p.targetProcessingTime(tt.args.metric)
+			got, err := p.targetProcessingTime(tt.args.metric, "s3://my-bucket/my-prefix/AWSLogs/123456789012/elasticloadbalancing/us-east-2/2022/05/01/123456789012_elasticloadbalancing_us-east-2_app.my-loadbalancer.1234567890abcdef_20220215T2340Z_172.160.001.192_20sg8hgm.log.gz")
 			if (err != nil) != tt.wantErr {
 				t.Errorf("targetProcessingTime() error = %v, wantErr %v", err, tt.wantErr)
 				return