Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Lancetnik authored May 20, 2024
2 parents aa5c2a7 + 13e46e9 commit fd3c333
Show file tree
Hide file tree
Showing 187 changed files with 5,434 additions and 1,162 deletions.
2 changes: 1 addition & 1 deletion .codespell-whitelist.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dependant
dependant
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ Please delete options that are not relevant.
- [ ] My changes do not generate any new warnings
- [ ] I have added tests to validate the effectiveness of my fix or the functionality of my new feature
- [ ] Both new and existing unit tests pass successfully on my local environment by running `scripts/test-cov.sh`
- [ ] I have ensured that static analysis tests are passing by running `scripts/static-anaylysis.sh`
- [ ] I have ensured that static analysis tests are passing by running `scripts/static-analysis.sh`
- [ ] I have included code examples to illustrate the modifications
18 changes: 9 additions & 9 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test-v03
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[rabbit,kafka,confluent,nats,redis,testing]
run: pip install .[optionals,testing]
- name: Install Pydantic v1
if: matrix.pydantic-version == 'pydantic-v1'
run: pip install "pydantic>=1.10.0,<2.0.0"
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
cache-dependency-path: pyproject.toml
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[nats,kafka,confluent,rabbit,redis,testing] orjson
run: pip install .[optionals,testing] orjson
- run: mkdir coverage
- name: Test
run: bash scripts/test.sh -m"(slow and (not nats and not kafka and not confluent and not rabbit and not redis)) or (not nats and not kafka and not confluent and not rabbit and not redis)"
Expand All @@ -144,7 +144,7 @@ jobs:
cache-dependency-path: pyproject.toml
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[rabbit,kafka,confluent,nats,redis,testing]
run: pip install .[optionals,testing]
- name: Test
run: bash scripts/test.sh -m "(slow and (not nats and not kafka and not confluent and not rabbit and not redis)) or (not nats and not kafka and not confluent and not rabbit and not redis)"

Expand All @@ -161,7 +161,7 @@ jobs:
cache-dependency-path: pyproject.toml
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[rabbit,kafka,confluent,nats,redis,testing]
run: pip install .[optionals,testing]
- name: Test
run: bash scripts/test.sh -m "(slow and (not nats and not kafka and not confluent and not rabbit and not redis)) or (not nats and not kafka and not confluent and not rabbit and not redis)"

Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
cache-dependency-path: pyproject.toml
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[nats,kafka,confluent,rabbit,redis,testing]
run: pip install .[optionals,testing]
- run: mkdir coverage
- name: Test
run: bash scripts/test.sh -m "(slow and kafka) or kafka"
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
cache-dependency-path: pyproject.toml
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[nats,kafka,confluent,rabbit,redis,testing]
run: pip install .[optionals,testing]
- run: mkdir coverage
- name: Test
run: bash scripts/test.sh -m "(slow and confluent) or confluent"
Expand Down Expand Up @@ -303,7 +303,7 @@ jobs:
cache-dependency-path: pyproject.toml
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[nats,kafka,confluent,rabbit,redis,testing]
run: pip install .[optionals,testing]
- run: mkdir coverage
- name: Test
run: bash scripts/test.sh -m "(slow and rabbit) or rabbit"
Expand Down Expand Up @@ -352,7 +352,7 @@ jobs:
cache-dependency-path: pyproject.toml
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[nats,kafka,confluent,rabbit,redis,testing]
run: pip install .[optionals,testing]
- run: mkdir coverage
- name: Test
run: bash scripts/test.sh -m "(slow and nats) or nats"
Expand Down Expand Up @@ -401,7 +401,7 @@ jobs:
cache-dependency-path: pyproject.toml
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[nats,kafka,confluent,rabbit,redis,testing]
run: pip install .[optionals,testing]
- run: mkdir coverage
- name: Test
run: bash scripts/test.sh -m "(slow and redis) or redis"
Expand Down
4 changes: 2 additions & 2 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"filename": "docs/docs/en/release.md",
"hashed_secret": "35675e68f4b5af7b995d9205ad0fc43842f16450",
"is_verified": false,
"line_number": 836,
"line_number": 1079,
"is_secret": false
}
],
Expand Down Expand Up @@ -163,5 +163,5 @@
}
]
},
"generated_at": "2024-04-07T03:11:32Z"
"generated_at": "2024-04-23T11:41:19Z"
}
52 changes: 52 additions & 0 deletions docs/docs/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ search:
- [FastAPI Plugin](getting-started/integrations/fastapi/index.md)
- [Django](getting-started/integrations/django/index.md)
- [CLI commands](getting-started/cli/index.md)
- [OpenTelemetry](getting-started/opentelemetry/index.md)
- [Logging](getting-started/logging.md)
- [Config Management](getting-started/config/index.md)
- [Task Scheduling](scheduling.md)
Expand Down Expand Up @@ -134,6 +135,7 @@ search:
- [KafkaRouter](public_api/faststream/kafka/KafkaRouter.md)
- [TestApp](public_api/faststream/kafka/TestApp.md)
- [TestKafkaBroker](public_api/faststream/kafka/TestKafkaBroker.md)
- [TopicPartition](public_api/faststream/kafka/TopicPartition.md)
- nats
- [AckPolicy](public_api/faststream/nats/AckPolicy.md)
- [ConsumerConfig](public_api/faststream/nats/ConsumerConfig.md)
Expand Down Expand Up @@ -438,6 +440,15 @@ search:
- [ConsumerProtocol](api/faststream/confluent/message/ConsumerProtocol.md)
- [FakeConsumer](api/faststream/confluent/message/FakeConsumer.md)
- [KafkaMessage](api/faststream/confluent/message/KafkaMessage.md)
- opentelemetry
- [KafkaTelemetryMiddleware](api/faststream/confluent/opentelemetry/KafkaTelemetryMiddleware.md)
- middleware
- [KafkaTelemetryMiddleware](api/faststream/confluent/opentelemetry/middleware/KafkaTelemetryMiddleware.md)
- provider
- [BaseConfluentTelemetrySettingsProvider](api/faststream/confluent/opentelemetry/provider/BaseConfluentTelemetrySettingsProvider.md)
- [BatchConfluentTelemetrySettingsProvider](api/faststream/confluent/opentelemetry/provider/BatchConfluentTelemetrySettingsProvider.md)
- [ConfluentTelemetrySettingsProvider](api/faststream/confluent/opentelemetry/provider/ConfluentTelemetrySettingsProvider.md)
- [telemetry_attributes_provider_factory](api/faststream/confluent/opentelemetry/provider/telemetry_attributes_provider_factory.md)
- parser
- [AsyncConfluentParser](api/faststream/confluent/parser/AsyncConfluentParser.md)
- publisher
Expand Down Expand Up @@ -495,6 +506,7 @@ search:
- [KafkaRouter](api/faststream/kafka/KafkaRouter.md)
- [TestApp](api/faststream/kafka/TestApp.md)
- [TestKafkaBroker](api/faststream/kafka/TestKafkaBroker.md)
- [TopicPartition](api/faststream/kafka/TopicPartition.md)
- broker
- [KafkaBroker](api/faststream/kafka/broker/KafkaBroker.md)
- broker
Expand All @@ -512,6 +524,15 @@ search:
- [ConsumerProtocol](api/faststream/kafka/message/ConsumerProtocol.md)
- [FakeConsumer](api/faststream/kafka/message/FakeConsumer.md)
- [KafkaMessage](api/faststream/kafka/message/KafkaMessage.md)
- opentelemetry
- [KafkaTelemetryMiddleware](api/faststream/kafka/opentelemetry/KafkaTelemetryMiddleware.md)
- middleware
- [KafkaTelemetryMiddleware](api/faststream/kafka/opentelemetry/middleware/KafkaTelemetryMiddleware.md)
- provider
- [BaseKafkaTelemetrySettingsProvider](api/faststream/kafka/opentelemetry/provider/BaseKafkaTelemetrySettingsProvider.md)
- [BatchKafkaTelemetrySettingsProvider](api/faststream/kafka/opentelemetry/provider/BatchKafkaTelemetrySettingsProvider.md)
- [KafkaTelemetrySettingsProvider](api/faststream/kafka/opentelemetry/provider/KafkaTelemetrySettingsProvider.md)
- [telemetry_attributes_provider_factory](api/faststream/kafka/opentelemetry/provider/telemetry_attributes_provider_factory.md)
- parser
- [AioKafkaParser](api/faststream/kafka/parser/AioKafkaParser.md)
- publisher
Expand Down Expand Up @@ -594,6 +615,15 @@ search:
- message
- [NatsBatchMessage](api/faststream/nats/message/NatsBatchMessage.md)
- [NatsMessage](api/faststream/nats/message/NatsMessage.md)
- opentelemetry
- [NatsTelemetryMiddleware](api/faststream/nats/opentelemetry/NatsTelemetryMiddleware.md)
- middleware
- [NatsTelemetryMiddleware](api/faststream/nats/opentelemetry/middleware/NatsTelemetryMiddleware.md)
- provider
- [BaseNatsTelemetrySettingsProvider](api/faststream/nats/opentelemetry/provider/BaseNatsTelemetrySettingsProvider.md)
- [NatsBatchTelemetrySettingsProvider](api/faststream/nats/opentelemetry/provider/NatsBatchTelemetrySettingsProvider.md)
- [NatsTelemetrySettingsProvider](api/faststream/nats/opentelemetry/provider/NatsTelemetrySettingsProvider.md)
- [telemetry_attributes_provider_factory](api/faststream/nats/opentelemetry/provider/telemetry_attributes_provider_factory.md)
- parser
- [BatchParser](api/faststream/nats/parser/BatchParser.md)
- [JsParser](api/faststream/nats/parser/JsParser.md)
Expand Down Expand Up @@ -636,6 +666,16 @@ search:
- [PatchedMessage](api/faststream/nats/testing/PatchedMessage.md)
- [TestNatsBroker](api/faststream/nats/testing/TestNatsBroker.md)
- [build_message](api/faststream/nats/testing/build_message.md)
- opentelemetry
- [TelemetryMiddleware](api/faststream/opentelemetry/TelemetryMiddleware.md)
- [TelemetrySettingsProvider](api/faststream/opentelemetry/TelemetrySettingsProvider.md)
- consts
- [MessageAction](api/faststream/opentelemetry/consts/MessageAction.md)
- middleware
- [BaseTelemetryMiddleware](api/faststream/opentelemetry/middleware/BaseTelemetryMiddleware.md)
- [TelemetryMiddleware](api/faststream/opentelemetry/middleware/TelemetryMiddleware.md)
- provider
- [TelemetrySettingsProvider](api/faststream/opentelemetry/provider/TelemetrySettingsProvider.md)
- rabbit
- [ExchangeType](api/faststream/rabbit/ExchangeType.md)
- [RabbitBroker](api/faststream/rabbit/RabbitBroker.md)
Expand All @@ -662,6 +702,12 @@ search:
- [RabbitRouter](api/faststream/rabbit/fastapi/router/RabbitRouter.md)
- message
- [RabbitMessage](api/faststream/rabbit/message/RabbitMessage.md)
- opentelemetry
- [RabbitTelemetryMiddleware](api/faststream/rabbit/opentelemetry/RabbitTelemetryMiddleware.md)
- middleware
- [RabbitTelemetryMiddleware](api/faststream/rabbit/opentelemetry/middleware/RabbitTelemetryMiddleware.md)
- provider
- [RabbitTelemetrySettingsProvider](api/faststream/rabbit/opentelemetry/provider/RabbitTelemetrySettingsProvider.md)
- parser
- [AioPikaParser](api/faststream/rabbit/parser/AioPikaParser.md)
- publisher
Expand Down Expand Up @@ -746,6 +792,12 @@ search:
- [StreamMessage](api/faststream/redis/message/StreamMessage.md)
- [UnifyRedisDict](api/faststream/redis/message/UnifyRedisDict.md)
- [UnifyRedisMessage](api/faststream/redis/message/UnifyRedisMessage.md)
- opentelemetry
- [RedisTelemetryMiddleware](api/faststream/redis/opentelemetry/RedisTelemetryMiddleware.md)
- middleware
- [RedisTelemetryMiddleware](api/faststream/redis/opentelemetry/middleware/RedisTelemetryMiddleware.md)
- provider
- [RedisTelemetrySettingsProvider](api/faststream/redis/opentelemetry/provider/RedisTelemetrySettingsProvider.md)
- parser
- [RawMessage](api/faststream/redis/parser/RawMessage.md)
- [RedisBatchListParser](api/faststream/redis/parser/RedisBatchListParser.md)
Expand Down
Binary file added docs/docs/assets/img/distributed-trace.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/docs/assets/img/simple-trace.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.confluent.opentelemetry.KafkaTelemetryMiddleware
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.confluent.opentelemetry.middleware.KafkaTelemetryMiddleware
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.confluent.opentelemetry.provider.BaseConfluentTelemetrySettingsProvider
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.confluent.opentelemetry.provider.BatchConfluentTelemetrySettingsProvider
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.confluent.opentelemetry.provider.ConfluentTelemetrySettingsProvider
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.confluent.opentelemetry.provider.telemetry_attributes_provider_factory
11 changes: 11 additions & 0 deletions docs/docs/en/api/faststream/kafka/TopicPartition.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: aiokafka.structs.TopicPartition
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.kafka.opentelemetry.KafkaTelemetryMiddleware
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.kafka.opentelemetry.middleware.KafkaTelemetryMiddleware
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.kafka.opentelemetry.provider.BaseKafkaTelemetrySettingsProvider
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.kafka.opentelemetry.provider.BatchKafkaTelemetrySettingsProvider
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.kafka.opentelemetry.provider.KafkaTelemetrySettingsProvider
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.kafka.opentelemetry.provider.telemetry_attributes_provider_factory
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
# 0.5 - API
# 2 - Release
# 3 - Contributing
# 5 - Template Page
# 10 - Default
search:
boost: 0.5
---

::: faststream.nats.opentelemetry.NatsTelemetryMiddleware
Loading

0 comments on commit fd3c333

Please sign in to comment.