Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
d39c3ef
bootsrapping 2
linkolen Aug 2, 2021
0106783
Merge pull request #2 from shivagowda/linkolen-patch-2
linkolen Aug 2, 2021
24e3451
Refactor SpiLoader and enhance SPI mechanism (#1383)
cdfive Jan 27, 2021
132d767
Merge pull request #3 from shivagowda/taha-master-patches-01
linkolen Aug 2, 2021
0217a71
dashboard: authFilterExcludeUrls supports matching path pattern like …
brotherlu-xcq Jan 27, 2021
c10074a
Merge pull request #4 from shivagowda/taha-master-patches-02
linkolen Aug 2, 2021
a05fa4d
Improve MetricFetcher under concurrent conditions (#1918)
samuelllin Jan 28, 2021
86987c6
Merge pull request #5 from shivagowda/taha-master-patches-03
linkolen Aug 2, 2021
dc4ca1b
dependency: Upgrade fastjson to 1.2.75 (#2006)
liuming-dev Feb 2, 2021
ef4fd07
Merge pull request #6 from shivagowda/taha-master-patches-04
linkolen Aug 2, 2021
33299a7
dependency: Upgrade snakeyaml to 1.26 in sentinel-cluster-server-envo…
liuming-dev Feb 3, 2021
db0d1d8
Merge pull request #7 from shivagowda/taha-master-patches-05
linkolen Aug 2, 2021
bc2143c
Improve RocketMQ integration example (#1757)
PeineLiang Feb 3, 2021
7eb97d1
Merge pull request #8 from shivagowda/taha-master-patches-06
linkolen Aug 2, 2021
b55d64e
Remove unused code (#1991)
zhouyongshen Feb 4, 2021
d56044f
Merge pull request #9 from shivagowda/taha-master-patches-07
linkolen Aug 2, 2021
9f183a3
Update source/target JDK version to 1.8 and update documents
sczyh30 Feb 1, 2021
657acf9
Merge pull request #10 from shivagowda/taha-master-patches-08
linkolen Aug 3, 2021
33b1fe3
Use JDK 1.8 native LongAdder instead and remove legacy LongAdder
sczyh30 Feb 1, 2021
b1d982c
Merge pull request #11 from shivagowda/taha-master-patches-09
linkolen Aug 3, 2021
daf07bd
Polish SpiLoader and SentinelConfig
sczyh30 Feb 4, 2021
7b21ff8
Merge pull request #12 from shivagowda/taha-master-patches-10
linkolen Aug 3, 2021
f2158d5
Bump version to 1.8.1
sczyh30 Feb 4, 2021
f08f13e
Merge pull request #13 from shivagowda/taha-master-patches-11
linkolen Aug 3, 2021
1f82691
Bump version to 1.8.2-SNAPSHOT
sczyh30 Feb 4, 2021
7247fa5
Merge pull request #14 from shivagowda/taha-master-patches-12
linkolen Aug 3, 2021
de75b44
Remove redundant code in SentinelResourceAspect (#2016)
ss-superman Feb 7, 2021
dfeb558
Merge pull request #15 from shivagowda/taha-master-patches-13
linkolen Aug 3, 2021
25263d7
dependency: Bump spring-core version to 5.1.18.RELEASE in sentinel-zu…
Slideee Feb 17, 2021
d55e561
Merge pull request #16 from shivagowda/taha-master-patches-14
linkolen Aug 3, 2021
57b2e63
Add sentinel-transport-spring-mvc module (#1957)
shenbaoyong Feb 23, 2021
ae90c33
Merge pull request #17 from shivagowda/taha-master-patches-15
linkolen Aug 3, 2021
90ec39d
dependency: Upgrade Netty to 4.1.48.Final in sentinel-cluster pom (#2…
brotherlu-xcq Feb 23, 2021
b26624c
Merge pull request #18 from shivagowda/taha-master-patches-16
linkolen Aug 3, 2021
7274839
dashboard: Use delimiter '@' only in maven-resources-plugin config of…
Anilople Feb 25, 2021
c592a3c
Merge pull request #19 from shivagowda/taha-master-patches-17
linkolen Aug 3, 2021
0a3a67e
doc: Add Sentinel website in README.md (#2054)
Anilople Feb 27, 2021
5d62fe3
Merge pull request #20 from shivagowda/taha-master-patches-18
linkolen Aug 4, 2021
cd424d9
doc: Fix incorrect comment of rollingCounterInSecond in StatisticNode…
huakai-zhang Mar 3, 2021
3fa2c80
Merge pull request #21 from shivagowda/taha-master-patches-19
linkolen Aug 4, 2021
d01bca1
Simplify enums: reuse enum name and remove unnecessary code (#2032)
quaff Mar 4, 2021
80dd995
Merge pull request #22 from shivagowda/taha-master-patches-20
linkolen Aug 4, 2021
3fd3647
Remove unused HotParameterLeapArray in param flow control module (#2070)
VegetaPn Mar 8, 2021
8ae8a71
Merge pull request #23 from shivagowda/taha-master-patches-21
linkolen Aug 4, 2021
ccd8c85
dashboard: Improve support for customizing auth-related implementatio…
Anilople Mar 8, 2021
20effb6
Merge pull request #24 from shivagowda/taha-master-patches-22
linkolen Aug 4, 2021
4e0c1ab
Add GitHub Actions CI workflow (#1992)
brotherlu-xcq Mar 9, 2021
77a1210
Merge pull request #25 from shivagowda/taha-master-patches-23
linkolen Aug 4, 2021
440385c
Support Redis cluster mode in Redis data-source extension (#1751)
liqiangz Mar 9, 2021
c9e315d
Merge pull request #26 from shivagowda/taha-master-patches-24
linkolen Aug 4, 2021
90bf516
example: Add separate demo for slot/slot chain SPI (#2085)
cdfive Mar 19, 2021
aa8c61c
Merge pull request #27 from shivagowda/taha-master-patches-25
linkolen Aug 4, 2021
e609ddd
dashboard: Improve param validation in MachineRegistryController
sczyh30 Mar 23, 2021
0fa221b
Merge pull request #28 from shivagowda/taha-master-patches-26
linkolen Aug 4, 2021
6561608
Update README.md
shivagowda Aug 6, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Sentinel CI

on: [push]

jobs:
build:
runs-on: ubuntu-18.04
strategy:
matrix:
java: [8, 11]
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
architecture: x64

- name: Test with Maven
run: mvn test

- name: Build with Maven
run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -DminimumPriority=1

- name: Run Codecov
run: bash <(curl -s https://codecov.io/bash)
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
[![Gitter](https://badges.gitter.im/alibaba/Sentinel.svg)](https://gitter.im/alibaba/Sentinel)

## Introduction
## Introduction

As distributed systems become increasingly popular, the reliability between services is becoming more important than ever before.
Sentinel takes "flow" as breakthrough point, and works on multiple fields including **flow control**,
Expand All @@ -28,6 +28,8 @@ Features overview:

## Documentation

See the [Sentinel](https://sentinelguard.io/) for the document website.

See the [中文文档](https://github.com/alibaba/Sentinel/wiki/%E4%BB%8B%E7%BB%8D) for document in Chinese.

See the [Wiki](https://github.com/alibaba/Sentinel/wiki) for full documentation, examples, blog posts, operational details and other information.
Expand All @@ -49,16 +51,16 @@ Below is a simple demo that guides new users to use Sentinel in just 3 steps. It

### 1. Add Dependency

**Note:** Sentinel Core requires Java 7 or later.
**Note:** Sentinel requires JDK 1.8 or later.

If your're using Maven, just add the following dependency in `pom.xml`.
If you're using Maven, just add the following dependency in `pom.xml`.

```xml
<!-- replace here with the latest version -->
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-core</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
</dependency>
```

Expand Down
14 changes: 10 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-parent</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
Expand Down Expand Up @@ -41,7 +41,7 @@

<properties>
<!-- Compile libs -->
<fastjson.version>1.2.71</fastjson.version>
<fastjson.version>1.2.75</fastjson.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>

<!-- Test libs -->
Expand All @@ -53,8 +53,8 @@

<!-- Build -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.source.version>1.7</java.source.version>
<java.target.version>1.7</java.target.version>
<java.source.version>1.8</java.source.version>
<java.target.version>1.8</java.target.version>
<java.encoding>UTF-8</java.encoding>
<maven.compiler.version>3.8.0</maven.compiler.version>
<maven.surefire.version>2.22.1</maven.surefire.version>
Expand Down Expand Up @@ -144,6 +144,11 @@
<artifactId>sentinel-transport-netty-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-transport-spring-mvc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-transport-common</artifactId>
Expand Down Expand Up @@ -373,6 +378,7 @@
</plugins>
</build>
<distributionManagement>

<snapshotRepository>
<id>oss</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
Expand Down
2 changes: 1 addition & 1 deletion sentinel-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-parent</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<artifactId>sentinel-adapter</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion sentinel-adapter/sentinel-apache-dubbo-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sentinel-adapter</artifactId>
<groupId>com.alibaba.csp</groupId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sentinel-adapter</artifactId>
<groupId>com.alibaba.csp</groupId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
7 changes: 1 addition & 6 deletions sentinel-adapter/sentinel-api-gateway-adapter-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,13 @@
<parent>
<artifactId>sentinel-adapter</artifactId>
<groupId>com.alibaba.csp</groupId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>sentinel-api-gateway-adapter-common</artifactId>
<packaging>jar</packaging>

<properties>
<java.source.version>1.7</java.source.version>
<java.target.version>1.7</java.target.version>
</properties>

<dependencies>
<dependency>
<groupId>com.alibaba.csp</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import com.alibaba.csp.sentinel.property.PropertyListener;
import com.alibaba.csp.sentinel.property.SentinelProperty;
import com.alibaba.csp.sentinel.util.AssertUtil;
import com.alibaba.csp.sentinel.util.SpiLoader;
import com.alibaba.csp.sentinel.spi.SpiLoader;
import com.alibaba.csp.sentinel.util.StringUtil;

/**
Expand Down Expand Up @@ -59,7 +59,7 @@ public final class GatewayApiDefinitionManager {
}

private static void initializeApiChangeObserverSpi() {
List<ApiDefinitionChangeObserver> listeners = SpiLoader.loadInstanceList(ApiDefinitionChangeObserver.class);
List<ApiDefinitionChangeObserver> listeners = SpiLoader.of(ApiDefinitionChangeObserver.class).loadInstanceList();
for (ApiDefinitionChangeObserver e : listeners) {
API_CHANGE_OBSERVERS.put(e.getClass().getCanonicalName(), e);
RecordLog.info("[GatewayApiDefinitionManager] ApiDefinitionChangeObserver added: {}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowException;
import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
import com.alibaba.csp.sentinel.slots.block.flow.param.ParameterMetricStorage;
import com.alibaba.csp.sentinel.spi.SpiOrder;
import com.alibaba.csp.sentinel.spi.Spi;

/**
* @author Eric Zhao
* @since 1.6.1
*/
@SpiOrder(-4000)
@Spi(order = -4000)
public class GatewayFlowSlot extends AbstractLinkedProcessorSlot<DefaultNode> {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
* @author Eric Zhao
* @since 1.6.1
*
* @deprecated since 1.7.2, we can use @SpiOrder(-4000) to adjust the order of {@link GatewayFlowSlot},
* @deprecated since 1.7.2, we can use @Spi(order = -4000) to adjust the order of {@link GatewayFlowSlot},
* this class is reserved for compatibility with older versions.
*
* @see GatewayFlowSlot
* @see DefaultSlotChainBuilder
*/
Expand Down
2 changes: 1 addition & 1 deletion sentinel-adapter/sentinel-dubbo-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-adapter</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sentinel-dubbo-adapter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sentinel-adapter/sentinel-grpc-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sentinel-adapter</artifactId>
<groupId>com.alibaba.csp</groupId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sentinel-grpc-adapter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sentinel-adapter/sentinel-jax-rs-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-adapter</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>

<artifactId>sentinel-jax-rs-adapter</artifactId>
Expand Down
18 changes: 3 additions & 15 deletions sentinel-adapter/sentinel-motan-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sentinel-adapter</artifactId>
<groupId>com.alibaba.csp</groupId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sentinel-motan-adapter</artifactId>
Expand All @@ -20,6 +20,7 @@
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-core</artifactId>
</dependency>

<dependency>
<groupId>com.weibo</groupId>
<artifactId>motan-core</artifactId>
Expand All @@ -33,18 +34,5 @@
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>${java.encoding}</encoding>
</configuration>
</plugin>
</plugins>
</build>

</project>
2 changes: 1 addition & 1 deletion sentinel-adapter/sentinel-okhttp-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sentinel-adapter</artifactId>
<groupId>com.alibaba.csp</groupId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sentinel-adapter/sentinel-quarkus-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-adapter</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>

<artifactId>sentinel-quarkus-adapter-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-quarkus-adapter-parent</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-quarkus-adapter-parent</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-quarkus-adapter-parent</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-quarkus-adapter-parent</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-quarkus-adapter-parent</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-quarkus-adapter-parent</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 0 additions & 2 deletions sentinel-adapter/sentinel-reactor-adapter/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Sentinel Reactor Adapter

> Note: this module requires Java 8 or later version.

Sentinel provides integration module for [Reactor](https://projectreactor.io/).

Add the following dependency in `pom.xml` (if you are using Maven):
Expand Down
2 changes: 1 addition & 1 deletion sentinel-adapter/sentinel-reactor-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sentinel-adapter</artifactId>
<groupId>com.alibaba.csp</groupId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sentinel-adapter/sentinel-sofa-rpc-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sentinel-adapter</artifactId>
<groupId>com.alibaba.csp</groupId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Sentinel Spring Cloud Gateway Adapter

> Note: this module requires Java 8 or later version.

Sentinel provides integration module with Spring Cloud Gateway.
The integration module is based on the Sentinel Reactor Adapter.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sentinel-adapter</artifactId>
<groupId>com.alibaba.csp</groupId>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 0 additions & 2 deletions sentinel-adapter/sentinel-spring-webflux-adapter/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Sentinel Spring WebFlux Adapter

> Note: this module requires Java 8 or later version.

Sentinel provides integration module with Spring WebFlux, so reactive web applications can also leverage Sentinel's flow control
and circuit breaking to achieve reliability. The integration module is based on the Sentinel Reactor Adapter.

Expand Down
Loading