Merge branch 'main' into sean/dropwizard-logging

apache · Oct 16, 2024 · d0e800e · d0e800e
2 parents d55adf4 + 9dfab70
commit d0e800e
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 71 deletions.
diff --git a/...-service/src/main/java/org/apache/polaris/service/ratelimiter/TokenBucketRateLimiter.java b/...-service/src/main/java/org/apache/polaris/service/ratelimiter/TokenBucketRateLimiter.java
@@ -44,7 +44,7 @@ public TokenBucketRateLimiter(long tokensPerSecond, long maxTokens, InstantSourc
   /**
    * Tries to acquire and spend 1 token. Doesn't block if a token isn't available.
    *
-   * @return whether a token was successfully acquired & spent
+   * @return whether a token was successfully acquired and spent
    */
   @Override
   public synchronized boolean tryAcquire() {

diff --git a/polaris-service/src/main/java/org/apache/polaris/service/tracing/TracingFilter.java b/polaris-service/src/main/java/org/apache/polaris/service/tracing/TracingFilter.java
@@ -45,7 +45,7 @@
  * Servlet {@link Filter} that starts an OpenTracing {@link Span}, propagating the calling context
  * from HTTP headers, if present. "spanId" and "traceId" are added to the logging MDC so that all
  * logs recorded in the request will contain the current span and trace id. Downstream HTTP calls
- * should use the OpenTelementry {@link io.opentelemetry.context.propagation.ContextPropagators} to
+ * should use the OpenTelemetry {@link io.opentelemetry.context.propagation.ContextPropagators} to
  * include the current trace id in the request headers.
  */
 @Priority(Priorities.AUTHENTICATION - 1)