Skip to content

Commit

Permalink
feat: Response Analytics (#161)
Browse files Browse the repository at this point in the history
Co-authored-by: Rakowskiii <38994251+Rakowskiii@users.noreply.github.com>
  • Loading branch information
HarryET and Rakowskiii committed Jul 18, 2023
1 parent 12b2331 commit 5698d83
Show file tree
Hide file tree
Showing 10 changed files with 242 additions and 79 deletions.
9 changes: 0 additions & 9 deletions .cargo/config.toml

This file was deleted.

77 changes: 77 additions & 0 deletions .github/workflows/publish_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: publish_image

on:
push:
branches:
- main

jobs:
build-container:
runs-on:
group: ubuntu-runners
strategy:
matrix:
file: [Dockerfile, slim.Dockerfile]
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
# Ensure that we get the new version from updated Cargo.toml
- name: Move to HEAD
run: |
git reset --hard HEAD
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: eu-central-1

# Authenticate with ECR
- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
logout: false

- name: Set tag suffix
id: suffix
run: |
if [[ "${{ matrix.file }}" == *.* ]]; then
echo "::set-output name=suffix:::$(echo "${{ matrix.file }}" | cut -d'.' -f1)"
else
echo "::set-output name=suffix::"
fi
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: |
${{ steps.login-ecr.outputs.registry }}/echo-server
walletconnect/echo-server,enable=false
flavor: |
latest=auto
tags: |
type=raw,value=${{ github.head_ref }},suffix=${{ steps.suffix.outputs.suffix }}
# Setup Buildkit
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Build, tag, and push image
uses: docker/build-push-action@v3
with:
context: .
file: ${{ matrix.file }}
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
2 changes: 1 addition & 1 deletion Cargo.lock

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

4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ RUN cargo install cargo-chef
FROM chef AS plan

WORKDIR /app
COPY ./.cargo ./.cargo
COPY Cargo.lock Cargo.toml ./
COPY src ./src
COPY crates ./crates
Expand All @@ -31,9 +30,6 @@ FROM chef AS build

ENV TINI_VERSION v0.19.0

# Ensure Cargo Config Copied
COPY ./.cargo ./.cargo

# This is a build requirement of `opentelemetry-otlp`. Once the new version
# is rolled out, which no longer requires the `protoc`, we'll be able to
# get rid of this.
Expand Down
4 changes: 0 additions & 4 deletions slim.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ RUN cargo install cargo-chef
FROM chef AS plan

WORKDIR /app
COPY ./.cargo ./.cargo
COPY Cargo.lock Cargo.toml ./
COPY src ./src
COPY crates ./crates
Expand All @@ -31,9 +30,6 @@ FROM chef AS build

ENV TINI_VERSION v0.19.0

# Ensure Cargo Config Copied
COPY ./.cargo ./.cargo

# This is a build requirement of `opentelemetry-otlp`. Once the new version
# is rolled out, which no longer requires the `protoc`, we'll be able to
# get rid of this.
Expand Down
2 changes: 2 additions & 0 deletions src/analytics/message_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@ pub struct MessageInfo {
pub push_provider: Arc<str>,
pub encrypted: bool,
pub flags: u32,
pub status: u16,
pub response_message: Option<Arc<str>>,
pub received_at: chrono::NaiveDateTime,
}
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl Config {
pub fn is_valid(&self) -> error::Result<()> {
#[cfg(feature = "multitenant")]
{
if &self.tenant_database_url == &self.database_url {
if self.tenant_database_url == self.database_url {
return Err(InvalidConfiguration(
"`TENANT_DATABASE_URL` is equal to `DATABASE_URL`, this is not allowed"
.to_string(),
Expand Down
Loading

0 comments on commit 5698d83

Please sign in to comment.