Skip to content
This repository has been archived by the owner on Dec 19, 2023. It is now read-only.

Commit

Permalink
Revert "Remove Ovo stuff"
Browse files Browse the repository at this point in the history
This reverts commit fcb335f.
  • Loading branch information
Keir Lawson committed Dec 19, 2023
1 parent fcb335f commit 727e865
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 16 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ for counters, timers, gauges and distributions.
Add the following dependency to your `build.sbt`:

```scala
libraryDependencies += "io.github.keirlawson" %% "meters4s" % "<see latest version>"
libraryDependencies += "com.ovoenergy" %% "meters4s" % "<see latest version>"
```

Or for Cats Effect 2.x use the 0.4.x series.
Expand All @@ -24,24 +24,24 @@ StatsD to provide and ergonomic means for creating reporters for these registrie
follows:

```scala
libraryDependencies += "io.github.keirlawson" %% "meters4s-datadog" % "<see latest version>"
libraryDependencies += "com.ovoenergy" %% "meters4s-datadog" % "<see latest version>"
```

or

```scala
libraryDependencies += "io.github.keirlawson" %% "meters4s-statsd" % "<see latest version>"
libraryDependencies += "com.ovoenergy" %% "meters4s-statsd" % "<see latest version>"
```

or

```scala
libraryDependencies += "io.github.keirlawson" %% "meters4s-prometheus" % "<see latest version>"
libraryDependencies += "com.ovoenergy" %% "meters4s-prometheus" % "<see latest version>"
```

## Usage

For comprehensive API documentation check [the scaladoc](https://keirlawson.github.io/meters4s/latest/api/).
For comprehensive API documentation check [the scaladoc](https://ovotech.github.io/meters4s/latest/api/).

A simple usage example for incrementing a counter, backed by a Micrometer `SimpleMeterRegistry`:

Expand Down
16 changes: 9 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lazy val root = (project in file("."))
name := "meters4s",
commonSettings,
libraryDependencies ++= commonDependencies,
git.remoteRepo := "git@github.com:keirlawson/meters4s.git",
git.remoteRepo := "git@github.com:ovotech/meters4s.git",
ScalaUnidoc / siteSubdirName := "latest/api",
addMappingsToSiteDir(
ScalaUnidoc / packageDoc / mappings,
Expand Down Expand Up @@ -39,33 +39,35 @@ lazy val root = (project in file("."))
.aggregate(core, datadog, statsd, prometheus, docs, http4s)

lazy val commonSettings = Seq(
organization := "io.github.keirlawson",
organization := "com.ovoenergy",
scalaVersion := "3.3.0",
crossScalaVersions ++= additionalSupportedScalaVersions,
homepage := Some(url("https://github.com/keirlawson/meters4s")),
organizationName := "OVO Energy",
organizationHomepage := Some(url("https://www.ovoenergy.com/")),
homepage := Some(url("https://github.com/ovotech/meters4s")),
startYear := Some(2020),
licenses := Seq(
("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))
),
scmInfo := Some(
ScmInfo(
url("https://github.com/keirlawson/meters4s"),
"git@github.com:keirlawson/meters4s.git"
url("https://github.com/ovotech/meters4s"),
"git@github.com:ovotech/meters4s.git"
)
),
developers := List(
Developer(
"keirlawson",
"Keir Lawson",
"keirlawson@gmail.com",
"keir,lawson@ovoenergy.com",
url("https://github.com/keirlawson")
)
)
)

lazy val publishSettings = Seq(
publishTo := sonatypePublishToBundle.value,
sonatypeProfileName := "io.github.keirlawson",
sonatypeProfileName := "com.ovoenergy",
publishMavenStyle := true
)

Expand Down
8 changes: 4 additions & 4 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ resolvers ++= Seq(
Add the following depdency to your `build.sbt`:

```scala
libraryDependencies += "io.github.keirlawson" %% "meters4s" % "@VERSION@"
libraryDependencies += "com.ovoenergy" %% "meters4s" % "@VERSION@"
```

You will likely also want to add the module corresponding to whichever monitoring system you want to report metrics to. All
Expand All @@ -28,18 +28,18 @@ For developer convience we also provide a couple of modules for particular monit
StatsD to provide and ergonomic means for creating reporters for these registries. These can be added to your poject as follows:

```scala
libraryDependencies += "io.github.keirlawson" %% "meters4s-datadog" % "@VERSION@"
libraryDependencies += "com.ovoenergy" %% "meters4s-datadog" % "@VERSION@"
```

or

```scala
libraryDependencies += "io.github.keirlawson" %% "meters4s-statsd" % "@VERSION@"
libraryDependencies += "com.ovoenergy" %% "meters4s-statsd" % "@VERSION@"
```

## Usage

For comprehensive API documentation check [the scaladoc](https://keirlawson.github.io/meters4s/latest/api/).
For comprehensive API documentation check [the scaladoc](https://ovotech.github.io/meters4s/latest/api/).

A simple usage example for incrementing a counter, backed by a Micrometer `SimpleMeterRegistry`:

Expand Down
16 changes: 16 additions & 0 deletions prometheus/src/main/scala/meter4s/prometheus/Prometheus.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2020 OVO Energy
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package meter4s.prometheus
import cats.effect.{Async, Resource, Sync}
import meters4s.{MetricsConfig, Reporter}
Expand Down

0 comments on commit 727e865

Please sign in to comment.