Skip to content

Commit

Permalink
kafka: rename to tools (#203)
Browse files Browse the repository at this point in the history
(cherry picked from commit f5f0c3c)

# Conflicts:
#	.github/workflows/release.yml
#	CHANGELOG.md
#	Cargo.lock
#	Cargo.toml
#	yellowstone-grpc-tools/Cargo.toml
  • Loading branch information
fanatid authored and mergify[bot] committed Oct 17, 2023
1 parent e9b1293 commit 9693b5f
Show file tree
Hide file tree
Showing 20 changed files with 326 additions and 278 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ on:
- 'v1.16'
tags:
- 'v*'
<<<<<<< HEAD
- 'kafka-v*'
=======
- 'tools-v*'
>>>>>>> f5f0c3c (kafka: rename to tools (#203))
workflow_dispatch:

env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ jobs:
run: cargo check -p yellowstone-grpc-client-simple --all-targets --tests
- name: check features in `geyser`
run: cargo check -p yellowstone-grpc-geyser --all-targets --tests
- name: check features in `kafka`
run: cargo check -p yellowstone-grpc-kafka --all-targets --tests
- name: check features in `proto`
run: cargo check -p yellowstone-grpc-proto --all-targets --tests
- name: check features in `tools`
run: cargo check -p yellowstone-grpc-tools --all-targets --tests

- name: Build
run: ./ci/cargo-build-test.sh
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The minor version will be incremented upon a breaking change and the patch versi

### Breaking

<<<<<<< HEAD
## 2023-10-14

- yellowstone-grpc-client-1.11.1+solana.1.16.17
Expand All @@ -26,6 +27,9 @@ The minor version will be incremented upon a breaking change and the patch versi
### Features

- solana: update to 1.16.17 ([#205](https://github.com/rpcpool/yellowstone-grpc/pull/205)).
=======
- kafka: rename to tools ([#203](https://github.com/rpcpool/yellowstone-grpc/pull/203)).
>>>>>>> f5f0c3c (kafka: rename to tools (#203))
## 2023-10-12

Expand Down
23 changes: 23 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
[workspace]
members = [
<<<<<<< HEAD
"examples/rust", # 1.10.0+solana.1.16.17
"yellowstone-grpc-client", # 1.11.1+solana.1.16.17
"yellowstone-grpc-geyser", # 1.10.0+solana.1.16.17
"yellowstone-grpc-kafka", # 1.0.0-rc.3+solana.1.16.17
"yellowstone-grpc-proto", # 1.10.0+solana.1.16.17
=======
"examples/rust", # 1.10.0+solana.1.17.1
"yellowstone-grpc-client", # 1.11.1+solana.1.17.1
"yellowstone-grpc-geyser", # 1.10.0+solana.1.17.1
"yellowstone-grpc-proto", # 1.10.0+solana.1.17.1
"yellowstone-grpc-tools", # 1.0.0-rc.4+solana.1.17.1
>>>>>>> f5f0c3c (kafka: rename to tools (#203))
]

[profile.release]
Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ It's possible to add limits for filters in config. If `filters` field is omitted
- [Rust](examples/rust)
- [TypeScript](examples/typescript)

### Kafka producer / consumer
### gRPC Tools

#### Kafka

In addition to gRPC Geyser Plugin we provide Kafka tool. This tool can works in 3 modes:

Expand All @@ -114,7 +116,7 @@ In addition to gRPC Geyser Plugin we provide Kafka tool. This tool can works in

```bash
$ cargo run --bin grpc-kafka -- --help
Yellowstone gRPC Kafka Producer/Dedup/Consumer
Yellowstone gRPC Kafka Tool

Usage: grpc-kafka [OPTIONS] --config <CONFIG> <COMMAND>

Expand All @@ -126,7 +128,6 @@ Commands:

Options:
-c, --config <CONFIG> Path to config file
--prometheus <PROMETHEUS> Prometheus listen address
-h, --help Print help
-V, --version Print version
```
Expand All @@ -135,11 +136,11 @@ Options:

```bash
# run kafka locally
docker-compose -f ./yellowstone-grpc-kafka/docker-kafka.yml up
docker-compose -f ./yellowstone-grpc-tools/docker-kafka.yml up
# create topic
kafka_2.13-3.5.0/bin/kafka-topics.sh --bootstrap-server localhost:29092 --create --topic grpc1
# send messages from gRPC to Kafka
cargo run --bin grpc-kafka -- --config yellowstone-grpc-kafka/config.json --prometheus 127.0.0.1:8873 grpc2kafka
cargo run --bin grpc-kafka -- --config yellowstone-grpc-tools/config-kafka.json grpc2kafka
# read messages from Kafka
kafka_2.13-3.5.0/bin/kafka-console-consumer.sh --bootstrap-server localhost:29092 --topic grpc1
```
Expand Down
242 changes: 0 additions & 242 deletions yellowstone-grpc-kafka/src/prom.rs

This file was deleted.

Loading

0 comments on commit 9693b5f

Please sign in to comment.