Update fork

.github/workflows/nebula-ci.yml

@@ -0,0 +1,49 @@
+name: "CI"
+on:
+  push:
+    branches:
+      - '*'
+    tags-ignore:
+      - '*'
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # test against JDK 8
+        java: [ 8 ]
+    name: CI with Java ${{ matrix.java }}
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup git user
+        run: |
+          git config --global user.name "Netflix OSS Maintainers"
+          git config --global user.email "[email protected]"
+      - name: Setup jdk
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - uses: actions/cache@v1
+        id: gradle-cache
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
+          restore-keys: |
+            - ${{ runner.os }}-gradle-
+      - uses: actions/cache@v1
+        id: gradle-wrapper-cache
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+          restore-keys: |
+            - ${{ runner.os }}-gradlewrapper-
+      - name: Build with Gradle
+        run: ./gradlew --info --stacktrace build
+        env:
+          CI_NAME: github_actions
+          CI_BUILD_NUMBER: ${{ github.sha }}
+          CI_BUILD_URL: 'https://github.com/${{ github.repository }}'
+          CI_BRANCH: ${{ github.ref }}
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/nebula-publish.yml

@@ -0,0 +1,52 @@
+name: "Publish candidate/release to NetflixOSS and Maven Central"
+on:
+  push:
+    tags:
+      - v*.*.*
+      - v*.*.*-rc.*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup git user
+        run: |
+          git config --global user.name "Netflix OSS Maintainers"
+          git config --global user.email "[email protected]"
+      - name: Setup jdk 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - uses: actions/cache@v1
+        id: gradle-cache
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
+          restore-keys: |
+            - ${{ runner.os }}-gradle-
+      - uses: actions/cache@v1
+        id: gradle-wrapper-cache
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+          restore-keys: |
+            - ${{ runner.os }}-gradlewrapper-
+      - name: Publish candidate
+        if: contains(github.ref, '-rc.')
+        run: ./gradlew --info --stacktrace -Prelease.useLastTag=true candidate
+        env:
+          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
+          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
+          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
+          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}
+      - name: Publish release
+        if: (!contains(github.ref, '-rc.'))
+        run: ./gradlew --info -Prelease.useLastTag=true final
+        env:
+          NETFLIX_OSS_SONATYPE_USERNAME: ${{ secrets.ORG_SONATYPE_USERNAME }}
+          NETFLIX_OSS_SONATYPE_PASSWORD: ${{ secrets.ORG_SONATYPE_PASSWORD }}
+          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
+          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
+          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
+          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}

.github/workflows/nebula-snapshot.yml

@@ -0,0 +1,41 @@
+name: "Publish snapshot to NetflixOSS and Maven Central"
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Setup git user
+        run: |
+          git config --global user.name "Netflix OSS Maintainers"
+          git config --global user.email "[email protected]"
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - uses: actions/cache@v2
+        id: gradle-cache
+        with:
+          path: |
+            ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - uses: actions/cache@v2
+        id: gradle-wrapper-cache
+        with:
+          path: |
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
+      - name: Build
+        run: ./gradlew build snapshot
+        env:
+          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
+          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
+          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
+          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}

.gitignore

@@ -48,3 +48,5 @@ atlassian-ide-plugin.xml
 .settings
 .metadata
 
+# publishing secrets
+secrets/signing-key

README.md

@@ -55,7 +55,7 @@ In this example a GRPC server is configured with a single adaptive limiter that
 // Create and configure a server builder
 ServerBuilder builder = ...;
 
-builder.addService(ServerInterceptor.intercept(service,
+builder.addService(ServerInterceptors.intercept(service,
     ConcurrencyLimitServerInterceptor.newBuilder(
         new GrpcServerLimiterBuilder()
             .partitionByHeader(GROUP_HEADER)

build.gradle

@@ -1,25 +1,46 @@
+import org.gradle.api.tasks.testing.Test
+
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
+        maven {
+            url = 'https://plugins.gradle.org/m2'
+        }
     }
     dependencies {
         classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.2'
     }
 }
 
 plugins {
-    id 'nebula.netflixoss' version '6.1.0'
+    id 'nebula.netflixoss' version '11.5.0'
 }
 
 // Establish version and status
 ext.githubProjectName = rootProject.name 
 
 subprojects {
     apply plugin: 'nebula.netflixoss'
+    apply plugin: 'java-library'
     group = "com.netflix.${githubProjectName}" 
 
     repositories {
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
+
+
+    ext {
+        grpcVersion = "1.9.0"
+        jUnitVersion = "5.+"
+        jUnitLegacyVersion = "4.+"
+        mockitoVersion = "4.+"
+        slf4jVersion = "1.7.+"
+        spectatorVersion = "1.+"
+        springVersion = "5.+"
+    }
+
+    tasks.withType(Test) {
+        useJUnitPlatform()
+    }
 }

concurrency-limits-core/build.gradle

@@ -5,10 +5,10 @@ plugins {
 sourceCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    compile "org.slf4j:slf4j-api:1.7.+"
-
-    testCompile 'junit:junit-dep:4.10'
-    testCompile "org.slf4j:slf4j-log4j12:1.7.+"
+    implementation "org.slf4j:slf4j-api:${slf4jVersion}"
 
-    testCompile 'com.github.kevinmost:junit-retry-rule:cbdd972d7c'
+    testCompileOnly "junit:junit:${jUnitLegacyVersion}"
+    testImplementation "org.slf4j:slf4j-log4j12:${slf4jVersion}"
+    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${jUnitVersion}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${jUnitVersion}"
 }

concurrency-limits-core/dependencies.lock

@@ -0,0 +1,37 @@
+{
+    "compileClasspath": {
+        "org.slf4j:slf4j-api": {
+            "locked": "1.7.36"
+        }
+    },
+    "runtimeClasspath": {
+        "org.slf4j:slf4j-api": {
+            "locked": "1.7.36"
+        }
+    },
+    "testCompileClasspath": {
+        "junit:junit": {
+            "locked": "4.13.2"
+        },
+        "org.slf4j:slf4j-api": {
+            "locked": "1.7.36"
+        },
+        "org.slf4j:slf4j-log4j12": {
+            "locked": "1.7.36"
+        }
+    },
+    "testRuntimeClasspath": {
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.10.2"
+        },
+        "org.junit.vintage:junit-vintage-engine": {
+            "locked": "5.10.2"
+        },
+        "org.slf4j:slf4j-api": {
+            "locked": "1.7.36"
+        },
+        "org.slf4j:slf4j-log4j12": {
+            "locked": "1.7.36"
+        }
+    }
+}

concurrency-limits-core/src/main/java/com/netflix/concurrency/limits/MetricRegistry.java

@@ -27,6 +27,14 @@ public interface MetricRegistry {
      */
     interface SampleListener {
         void addSample(Number value);
+
+        default void addLongSample(long value) {
+            addSample(value);
+        }
+
+        default void addDoubleSample(double value) {
+            addSample(value);
+        }
     }
 
     interface Counter {
@@ -59,7 +67,7 @@ default SampleListener distribution(String id, String... tagNameValuePairs) {
      */
     @Deprecated
     default void registerGauge(String id, Supplier<Number> supplier, String... tagNameValuePairs) {
-        throw new UnsupportedOperationException("registerDistribution is deprecated");
+        throw new UnsupportedOperationException("registerGauge is deprecated");
     }
 
     /**

concurrency-limits-core/src/main/java/com/netflix/concurrency/limits/limit/AIMDLimit.java

@@ -17,6 +17,8 @@
 
 import com.netflix.concurrency.limits.Limit;
 import com.netflix.concurrency.limits.internal.Preconditions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.TimeUnit;
 
@@ -26,6 +28,7 @@
  */
 public final class AIMDLimit extends AbstractLimit {
     private static final long DEFAULT_TIMEOUT = TimeUnit.SECONDS.toNanos(5);
+    private static final Logger LOG = LoggerFactory.getLogger(AIMDLimit.class);
 
     public static class Builder {
         private int minLimit = 20;
@@ -68,6 +71,12 @@ public Builder timeout(long timeout, TimeUnit units) {
         }
 
         public AIMDLimit build() {
+            if (initialLimit > maxLimit) {
+                LOG.warn("Initial limit {} exceeded maximum limit {}", initialLimit, maxLimit);
+            }
+            if (initialLimit < minLimit) {
+                LOG.warn("Initial limit {} is less than minimum limit {}", initialLimit, minLimit);
+            }
             return new AIMDLimit(this);
         }
     }
@@ -99,10 +108,6 @@ protected int _update(long startTime, long rtt, int inflight, boolean didDrop) {
             currentLimit =  currentLimit + 1;
         }
 
-        if (currentLimit >= maxLimit) {
-            currentLimit = currentLimit / 2;
-        }
-
         return Math.min(maxLimit, Math.max(minLimit, currentLimit));
     }