Fix naming of local config

Author: majanjua-amzn

.github/patches/opentelemetry-java-contrib.patch

@@ -80,7 +80,7 @@ index 00000000..41f22f90
 +}
 diff --git a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayAdaptiveSamplingConfig.java b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayAdaptiveSamplingConfig.java
 new file mode 100644
-index 00000000..836ebf98
+index 00000000..b2146f13
 --- /dev/null
 +++ b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayAdaptiveSamplingConfig.java
 @@ -0,0 +1,139 @@
@@ -207,17 +207,17 @@ index 00000000..836ebf98
 +  @JsonDeserialize(
 +      builder = AutoValue_AwsXrayAdaptiveSamplingConfig_ErrorCaptureLimit.Builder.class)
 +  public abstract static class ErrorCaptureLimit {
-+    @JsonProperty("errorSpansPerSecond")
-+    public abstract int getErrorSpansPerSecond();
++    @JsonProperty("errorTracesPerSecond")
++    public abstract int getErrorTracesPerSecond();
 +
 +    public static Builder builder() {
 +      return new AutoValue_AwsXrayAdaptiveSamplingConfig_ErrorCaptureLimit.Builder();
 +    }
 +
 +    @AutoValue.Builder
 +    public abstract static class Builder {
-+      @JsonProperty("errorSpansPerSecond")
-+      public abstract Builder setErrorSpansPerSecond(int value);
++      @JsonProperty("errorTracesPerSecond")
++      public abstract Builder setErrorTracesPerSecond(int value);
 +
 +      public abstract ErrorCaptureLimit build();
 +    }
@@ -902,7 +902,7 @@ index 1ef8abf5..328e63dd 100644
    }
  }
 diff --git a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java
-index 75977dc0..7cd9bcc5 100644
+index 75977dc0..23d3d490 100644
 --- a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java
 +++ b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java
 @@ -5,42 +5,81 @@
@@ -1044,10 +1044,10 @@ index 75977dc0..7cd9bcc5 100644
 +
 +    // Initialize anomaly capture rate limiter if error capture limit is configured
 +    if (adaptiveSamplingConfig != null && adaptiveSamplingConfig.getErrorCaptureLimit() != null) {
-+      int errorSpansPerSecond =
-+          adaptiveSamplingConfig.getErrorCaptureLimit().getErrorSpansPerSecond();
++      int errorTracesPerSecond =
++          adaptiveSamplingConfig.getErrorCaptureLimit().getErrorTracesPerSecond();
 +      this.anomalyCaptureRateLimiter =
-+          new RateLimiter(errorSpansPerSecond, errorSpansPerSecond, clock);
++          new RateLimiter(errorTracesPerSecond, errorTracesPerSecond, clock);
 +    }
    }
 
@@ -1104,9 +1104,9 @@ index 75977dc0..7cd9bcc5 100644
 +
 +      // Initialize anomaly capture rate limiter if error capture limit is configured
 +      if (config.getErrorCaptureLimit() != null) {
-+        int errorSpansPerSecond = config.getErrorCaptureLimit().getErrorSpansPerSecond();
++        int errorTracesPerSecond = config.getErrorCaptureLimit().getErrorTracesPerSecond();
 +        this.anomalyCaptureRateLimiter =
-+            new RateLimiter(errorSpansPerSecond, errorSpansPerSecond, clock);
++            new RateLimiter(errorTracesPerSecond, errorTracesPerSecond, clock);
 +      }
 +    }
 +  }
@@ -2005,7 +2005,7 @@ index 6bb6e82a..6d71711b 100644
      return applier.shouldSample(
          Context.current(),
 diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XrayRulesSamplerTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XrayRulesSamplerTest.java
-index 1ca8df34..f6a24af8 100644
+index 1ca8df34..2f25c8af 100644
 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XrayRulesSamplerTest.java
 +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XrayRulesSamplerTest.java
 @@ -5,17 +5,28 @@
@@ -2300,7 +2300,7 @@ index 1ca8df34..f6a24af8 100644
 +            .setVersion(1.0)
 +            .setErrorCaptureLimit(
 +                AwsXrayAdaptiveSamplingConfig.ErrorCaptureLimit.builder()
-+                    .setErrorSpansPerSecond(2)
++                    .setErrorTracesPerSecond(2)
 +                    .build())
 +            .build();
 +
@@ -2540,7 +2540,7 @@ index 1ca8df34..f6a24af8 100644
 +            .setVersion(1.0)
 +            .setErrorCaptureLimit(
 +                AwsXrayAdaptiveSamplingConfig.ErrorCaptureLimit.builder()
-+                    .setErrorSpansPerSecond(2)
++                    .setErrorTracesPerSecond(2)
 +                    .build())
 +            .setAnomalyConditions(
 +                Arrays.asList(
@@ -2684,7 +2684,7 @@ index 1ca8df34..f6a24af8 100644
 +            .setVersion(1.0)
 +            .setErrorCaptureLimit(
 +                AwsXrayAdaptiveSamplingConfig.ErrorCaptureLimit.builder()
-+                    .setErrorSpansPerSecond(2)
++                    .setErrorTracesPerSecond(2)
 +                    .build())
 +            .setAnomalyConditions(
 +                Arrays.asList(
@@ -2752,7 +2752,7 @@ index 1ca8df34..f6a24af8 100644
 +            .setVersion(1.0)
 +            .setErrorCaptureLimit(
 +                AwsXrayAdaptiveSamplingConfig.ErrorCaptureLimit.builder()
-+                    .setErrorSpansPerSecond(2)
++                    .setErrorTracesPerSecond(2)
 +                    .build())
 +            .setAnomalyConditions(
 +                Arrays.asList(
@@ -2820,7 +2820,7 @@ index 1ca8df34..f6a24af8 100644
 +            .setVersion(1.0)
 +            .setErrorCaptureLimit(
 +                AwsXrayAdaptiveSamplingConfig.ErrorCaptureLimit.builder()
-+                    .setErrorSpansPerSecond(2)
++                    .setErrorTracesPerSecond(2)
 +                    .build())
 +            .setAnomalyConditions(
 +                Arrays.asList(
@@ -2902,7 +2902,7 @@ index 1ca8df34..f6a24af8 100644
 +            .setVersion(1.0)
 +            .setErrorCaptureLimit(
 +                AwsXrayAdaptiveSamplingConfig.ErrorCaptureLimit.builder()
-+                    .setErrorSpansPerSecond(10)
++                    .setErrorTracesPerSecond(10)
 +                    .build())
 +            .setAnomalyConditions(
 +                Arrays.asList(

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProviderTest.java

@@ -81,7 +81,7 @@ void setAdaptiveSamplingConfigFromFile_validYaml()
     // Assert the configuration was parsed correctly
     assertThat(config).isNotNull();
     assertThat(config.getVersion()).isEqualTo(1);
-    assertThat(config.getErrorCaptureLimit().getErrorSpansPerSecond()).isEqualTo(10);
+    assertThat(config.getErrorCaptureLimit().getErrorTracesPerSecond()).isEqualTo(10);
   }
 
   @Test

awsagentprovider/src/test/resources/adaptive-sampling-config-invalid.yaml

@@ -10,4 +10,4 @@ anomalyConditions:
     operations: invalid part of config
     usage: both
 errorCaptureLimit:
-  errorSpansPerSecond: 10
+  errorTracesPerSecond: 10

awsagentprovider/src/test/resources/adaptive-sampling-config-valid.yaml

@@ -9,4 +9,4 @@ anomalyConditions:
   - errorCodeRegex: "^2\\d\\d$"
     usage: both
 errorCaptureLimit:
-  errorSpansPerSecond: 10
+  errorTracesPerSecond: 10