Lint fixes

amazon-contributing · Oct 11, 2023 · e45656c · e45656c
1 parent ca00a4d
commit e45656c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/exporter/jaegerthrifthttpexporter/README.md b/exporter/jaegerthrifthttpexporter/README.md
@@ -16,7 +16,7 @@ This exporter is being deprecated and will be removed in July 2023 as Jaeger sup
 
 This exporter supports sending trace data to [Jaeger](https://www.jaegertracing.io) over Thrift HTTP.
 
-*WARNING:* The [Jaeger gRPC Exporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/jaegerexporter) is the recommended one for exporting traces from an OpenTelemetry Collector to Jaeger. This Jaeger Thrift Exporter should only be used to export traces to a Jaeger Collector that is unable to expose the [gRPC API](https://www.jaegertracing.io/docs/1.27/apis/#protobuf-via-grpc-stable).
+*WARNING:* The Jaeger gRPC Exporter is the recommended one for exporting traces from an OpenTelemetry Collector to Jaeger. This Jaeger Thrift Exporter should only be used to export traces to a Jaeger Collector that is unable to expose the [gRPC API](https://www.jaegertracing.io/docs/1.27/apis/#protobuf-via-grpc-stable).
 
 ## Configuration
 

diff --git a/receiver/awscontainerinsightreceiver/internal/stores/podstore.go b/receiver/awscontainerinsightreceiver/internal/stores/podstore.go
@@ -608,11 +608,7 @@ func (p *PodStore) addPodContainerStatusMetrics(metric CIMetric, pod *corev1.Pod
 			reason := containerStatus.State.Waiting.Reason
 			if reason != "" {
 				if val, ok := ci.WaitingReasonLookup[reason]; ok {
-					if _, foundStatus := possibleStatuses[val]; foundStatus {
-						possibleStatuses[val]++
-					} else {
-						possibleStatuses[val] = 1
-					}
+					possibleStatuses[val]++
 				}
 			}
 		case containerStatus.State.Terminated != nil:
@@ -624,11 +620,7 @@ func (p *PodStore) addPodContainerStatusMetrics(metric CIMetric, pod *corev1.Pod
 
 		if containerStatus.LastTerminationState.Terminated != nil && containerStatus.LastTerminationState.Terminated.Reason != "" {
 			if strings.Contains(containerStatus.LastTerminationState.Terminated.Reason, "OOMKilled") {
-				if _, foundStatus := possibleStatuses[ci.StatusContainerTerminatedReasonOOMKilled]; foundStatus {
-					possibleStatuses[ci.StatusContainerTerminatedReasonOOMKilled]++
-				} else {
-					possibleStatuses[ci.StatusContainerTerminatedReasonOOMKilled] = 1
-				}
+				possibleStatuses[ci.StatusContainerTerminatedReasonOOMKilled]++
 			}
 		}
 	}

diff --git a/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go b/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go
@@ -720,7 +720,7 @@ func TestPodStore_addStatus_enhanced_metrics(t *testing.T) {
 	metric = generateMetric(fields, tags)
 
 	podStore.addStatus(metric, pod)
-	//assert.Equal(t, "Waiting", metric.GetTag(ci.ContainerStatus))
+	// assert.Equal(t, "Waiting", metric.GetTag(ci.ContainerStatus))
 	assert.Equal(t, 2, metric.GetField(ci.MetricName(ci.TypePod, ci.StatusContainerWaiting)))
 	assert.Equal(t, 2, metric.GetField(ci.MetricName(ci.TypePod, ci.StatusContainerWaitingReasonCrashLoopBackOff)))
 	// sparse metrics