Skip to content

Commit

Permalink
Update to Apodini 0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
PSchmiedmayer committed Jul 14, 2021
1 parent 0dfb269 commit 194af3a
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 21 deletions.
6 changes: 3 additions & 3 deletions Database/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/Apodini/ApodiniCollector.git", .upToNextMinor(from: "0.1.0")),
.package(url: "https://github.com/Apodini/ApodiniAnalystPresenter.git", .upToNextMinor(from: "0.1.0"))
.package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.3.0")),
.package(url: "https://github.com/Apodini/ApodiniCollector.git", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/Apodini/ApodiniAnalystPresenter.git", .upToNextMinor(from: "0.2.0"))
],
targets: [
.executableTarget(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ final class UserLocationModel: Model, Codable {
extension UserLocationModel: Migration {
func prepare(on database: Database) -> EventLoopFuture<Void> {
database
.schema(UserLocationModel.schema)
.field(.id, .uuid, .identifier(auto: true))
.field("userID", .int)
.field("latitude", .double)
.field("longitude", .double)
.create()
.schema(UserLocationModel.schema)
.field(.id, .uuid, .identifier(auto: true))
.field("userID", .int)
.field("latitude", .double)
.field("longitude", .double)
.create()
}

func revert(on database: Database) -> EventLoopFuture<Void> {
database
.schema(UserLocationModel.schema)
.delete()
.schema(UserLocationModel.schema)
.delete()
}
}
8 changes: 4 additions & 4 deletions Gateway/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/Apodini/ApodiniAsyncHTTPClient.git", .upToNextMinor(from: "0.1.1")),
.package(url: "https://github.com/Apodini/ApodiniCollector.git", .upToNextMinor(from: "0.1.0")),
.package(url: "https://github.com/Apodini/ApodiniAnalystPresenter.git", .upToNextMinor(from: "0.1.0"))
.package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.3.0")),
.package(url: "https://github.com/Apodini/ApodiniAsyncHTTPClient.git", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/Apodini/ApodiniCollector.git", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/Apodini/ApodiniAnalystPresenter.git", .upToNextMinor(from: "0.2.0"))
],
targets: [
.executableTarget(
Expand Down
8 changes: 4 additions & 4 deletions Processing/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/Apodini/ApodiniAsyncHTTPClient.git", .upToNextMinor(from: "0.1.1")),
.package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.3.0")),
.package(url: "https://github.com/Apodini/ApodiniAsyncHTTPClient.git", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/NSHipster/DBSCAN", .upToNextMinor(from: "0.0.1")),
.package(url: "https://github.com/Apodini/ApodiniCollector.git", .upToNextMinor(from: "0.1.0")),
.package(url: "https://github.com/Apodini/ApodiniAnalystPresenter.git", .upToNextMinor(from: "0.1.0"))
.package(url: "https://github.com/Apodini/ApodiniCollector.git", .upToNextMinor(from: "0.2.0")),
.package(url: "https://github.com/Apodini/ApodiniAnalystPresenter.git", .upToNextMinor(from: "0.2.0"))
],
targets: [
.executableTarget(
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Collector, Analyst, and Presenter Example System

[![DOI](https://zenodo.org/badge/379429348.svg)](https://zenodo.org/badge/latestdoi/379429348)
[![codecov](https://codecov.io/gh/Apodini/CollectorAnalystPresenterExample/branch/develop/graph/badge.svg?token=Sw8OvhWtcY)](https://codecov.io/gh/Apodini/CollectorAnalystPresenterExample)
[![jazzy](https://raw.githubusercontent.com/Apodini/CollectorAnalystPresenterExample/gh-pages/badge.svg)](https://apodini.github.io/CollectorAnalystPresenterExample/)
[![Build and Test](https://github.com/Apodini/CollectorAnalystPresenterExample/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/Apodini/CollectorAnalystPresenterExample/actions/workflows/build-and-test.yml)
[![Build Docker Compose](https://github.com/Apodini/CollectorAnalystPresenterExample/actions/workflows/docker-compose.yml/badge.svg)](https://github.com/Apodini/CollectorAnalystPresenterExample/actions/workflows/docker-compose.yml)

This repository contains an example system consitig of three web services that highlights the usage of [Collector](https://github.com/Apodini/Collector), [Analyst](https://github.com/Apodini/Analyst), and [Presenter](https://github.com/Apodini/Presenter) in combination with the [Apodini](https://github.com/Apodini/Apodini) framework using [ApodiniCollector](https://github.com/Apodini/ApodiniCollector) and [ApodiniAnalystPresenter](https://github.com/Apodini/ApodiniAnalystPresenter).
It features a database web service, a processing web service, and a gateway that offers the public API of the web service. All web services collect metrics and traces using the [Collector](https://github.com/Apodini/Collector) framework.
A client application allows developers to observe inisights generated using [Analyst](https://github.com/Apodini/Analyst) and pesented using [Presenter](https://github.com/Apodini/Presenter):
Expand Down Expand Up @@ -51,7 +57,7 @@ To easily continue developing the example system, you can open the *Example.xcwo
To test the collection of metrics and traces, you can run the `$ docker compose -f docker-compose-development.yml up` command in the root of the repo start-up adjacently deployed [Jaeger](https://www.jaegertracing.io) and [Prometheus](https://prometheus.io) instances used by the web services. All web services are configured to connect to the instances started using the `$ docker compose -f docker-compose-development.yml up` command.

## Contributing
Contributions to this project are welcome. Please make sure to read the [contribution guidelines](https://github.com/Apodini/.github/blob/release/CONTRIBUTING.md) first.
Contributions to this project are welcome. Please make sure to read the [contribution guidelines](https://github.com/Apodini/.github/blob/main/CONTRIBUTING.md) and the [contributor covenant code of conduct](https://github.com/Apodini/.github/blob/main/CODE_OF_CONDUCT.md) first.

## License
This project is licensed under the MIT License. See [License](https://github.com/Apodini/CollectorAnalystPresenterExample/blob/release/LICENSE) for more information.
This project is licensed under the MIT License. See [License](https://github.com/Apodini/CollectorAnalystPresenterExample/blob/develop/LICENSE) for more information.

0 comments on commit 194af3a

Please sign in to comment.