Skip to content

Commit

Permalink
Merge pull request #68 from profunktor/update/organization
Browse files Browse the repository at this point in the history
Organization changes
  • Loading branch information
gvolpe authored May 5, 2019
2 parents de3ac77 + 0c5a471 commit ce6928e
Show file tree
Hide file tree
Showing 46 changed files with 203 additions and 200 deletions.
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
http4s-tracer
=============

[![CircleCI](https://circleci.com/gh/gvolpe/http4s-tracer.svg?style=svg)](https://circleci.com/gh/gvolpe/http4s-tracer)
[![CircleCI](https://circleci.com/gh/profunktor/http4s-tracer.svg?style=svg)](https://circleci.com/gh/profunktor/http4s-tracer)
[![Gitter Chat](https://badges.gitter.im/http4s-tracer/http4s-tracer.svg)](https://gitter.im/http4s-tracer/http4s-tracer)
[![Maven Central](https://img.shields.io/maven-central/v/com.github.gvolpe/http4s-tracer_2.12.svg)](http://search.maven.org/#search%7Cga%7C1%7Chttp4s-tracer) <a href="https://typelevel.org/cats/"><img src="https://typelevel.org/cats/img/cats-badge.svg" height="40px" align="right" alt="Cats friendly" /></a>
[![Maven Central](https://img.shields.io/maven-central/v/dev.profunktor/http4s-tracer_2.12.svg)](http://search.maven.org/#search%7Cga%7C1%7Chttp4s-tracer) <a href="https://typelevel.org/cats/"><img src="https://typelevel.org/cats/img/cats-badge.svg" height="40px" align="right" alt="Cats friendly" /></a>

Distributed end-to-end tracing system for `http4s`.

Expand All @@ -12,20 +12,23 @@ Distributed end-to-end tracing system for `http4s`.
Add this to your `build.sbt`:

```
libraryDependencies += "com.github.gvolpe" %% "http4s-tracer" % Version
libraryDependencies += "dev.profunktor" %% "http4s-tracer" % Version
```

If you would like to have [log4cats](https://christopherdavenport.github.io/log4cats/) support add this extra dependency:

```
libraryDependencies += "com.github.gvolpe" %% "http4s-tracer-log4cats" % Version
libraryDependencies += "dev.profunktor" %% "http4s-tracer-log4cats" % Version
```

Find out more in the [microsite](https://gvolpe.github.io/http4s-tracer/).
Note: previous versions `<= 1.2.1` were published using the `com.github.gvolpe` group id.


Find out more in the [microsite](https://http4s-tracer.profunktor.dev/).

### Code of Conduct

See the [Code of Conduct](https://gvolpe.github.io/http4s-tracer/CODE_OF_CONDUCT)
See the [Code of Conduct](https://http4s-tracer.profunktor.dev/CODE_OF_CONDUCT)

## LICENSE

Expand Down
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import microsites.ExtraMdFileConfig

name := """https-tracer-root"""

organization in ThisBuild := "com.github.gvolpe"
organization in ThisBuild := "dev.profunktor"

crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.8")

sonatypeProfileName := "com.github.gvolpe"
sonatypeProfileName := "dev.profunktor"

promptTheme := PromptTheme(List(
text(_ => "[http4s-tracer]", fg(64)).padRight(" λ ")
Expand All @@ -18,8 +18,8 @@ promptTheme := PromptTheme(List(
lazy val commonSettings = Seq(
startYear := Some(2018),
licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")),
homepage := Some(url("https://github.com/gvolpe/http4s-tracer")),
headerLicense := Some(HeaderLicense.ALv2("2018-2019", "Gabriel Volpe")),
homepage := Some(url("https://http4s-tracer.profunktor.dev/")),
headerLicense := Some(HeaderLicense.ALv2("2018-2019", "ProfunKtor")),
libraryDependencies ++= Seq(
compilerPlugin(Libraries.kindProjector),
compilerPlugin(Libraries.betterMonadicFor),
Expand Down Expand Up @@ -48,7 +48,7 @@ lazy val commonSettings = Seq(
<developer>
<id>gvolpe</id>
<name>Gabriel Volpe</name>
<url>http://github.com/gvolpe</url>
<url>https://github.com/gvolpe</url>
</developer>
</developers>
)
Expand Down Expand Up @@ -103,10 +103,10 @@ lazy val microsite = project.in(file("site"))
.settings(
micrositeName := "Http4s Tracer",
micrositeDescription := "End-to-end tracing system for Http4s",
micrositeAuthor := "Gabriel Volpe",
micrositeGithubOwner := "gvolpe",
micrositeAuthor := "ProfunKtor",
micrositeGithubOwner := "profunktor",
micrositeGithubRepo := "http4s-tracer",
micrositeBaseUrl := "/http4s-tracer",
micrositeBaseUrl := "",
micrositeExtraMdFiles := Map(
file("README.md") -> ExtraMdFileConfig(
"index.md",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import org.http4s.dsl.Http4sDsl

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import cats.data.Kleisli
import Tracer.TraceId
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,13 +14,13 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import cats.Monad
import cats.data.{Kleisli, OptionT}
import cats.syntax.flatMap._
import cats.syntax.functor._
import com.github.gvolpe.tracer.Tracer.TraceId
import dev.profunktor.tracer.Tracer.TraceId
import org.http4s.{HttpRoutes, Request, Response}

object TracedHttpRoute {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import cats.Applicative
import cats.data.Kleisli
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,10 +14,10 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import com.github.gvolpe.tracer.TracedHttpRoute.TracedRequest
import com.github.gvolpe.tracer.Tracer.TraceId
import dev.profunktor.tracer.TracedHttpRoute.TracedRequest
import dev.profunktor.tracer.Tracer.TraceId
import org.http4s.Request

trait TracerDsl {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import scala.reflect.ClassTag

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,14 +14,14 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer.auth
package dev.profunktor.tracer.auth

import cats.Monad
import cats.data.{Kleisli, OptionT}
import cats.syntax.flatMap._
import cats.syntax.functor._
import com.github.gvolpe.tracer.Tracer
import com.github.gvolpe.tracer.Tracer.TraceId
import dev.profunktor.tracer.Tracer
import dev.profunktor.tracer.Tracer.TraceId
import org.http4s.{AuthedRequest, AuthedService, Response}

object AuthTracedHttpRoute {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,10 +14,10 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer.auth
package dev.profunktor.tracer.auth

import com.github.gvolpe.tracer.Tracer.TraceId
import com.github.gvolpe.tracer.auth.AuthTracedHttpRoute.AuthTracedRequest
import dev.profunktor.tracer.Tracer.TraceId
import dev.profunktor.tracer.auth.AuthTracedHttpRoute.AuthTracedRequest
import org.http4s.AuthedRequest

trait AuthTracerDsl {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer.auth
package dev.profunktor.tracer.auth

import org.http4s.dsl.Http4sDsl

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer
package instances

object tracer {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,13 +14,13 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer.instances
package dev.profunktor.tracer.instances

import cats.effect.Sync
import cats.syntax.flatMap._
import com.github.gvolpe.tracer.Trace
import com.github.gvolpe.tracer.Trace._
import com.github.gvolpe.tracer.TracerLog
import dev.profunktor.tracer.Trace
import dev.profunktor.tracer.Trace._
import dev.profunktor.tracer.TracerLog
import org.slf4j.{Logger, LoggerFactory}

import scala.reflect.ClassTag
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import cats.effect.IO
import cats.syntax.functor._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,10 +14,10 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import cats.effect.IO
import com.github.gvolpe.tracer.instances.tracerlog._
import dev.profunktor.tracer.instances.tracerlog._
import org.http4s._
import org.http4s.client.dsl.io._
import org.http4s.dsl.io._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,12 +14,12 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import cats.effect._
import cats.syntax.all._
import com.github.gvolpe.tracer.instances.tracer._
import com.github.gvolpe.tracer.log4cats._
import dev.profunktor.tracer.instances.tracer._
import dev.profunktor.tracer.log4cats._
import io.chrisdavenport.log4cats.slf4j.Slf4jLogger

object Log4CatsServer extends IOApp {
Expand Down
10 changes: 5 additions & 5 deletions examples/src/main/scala/com/github/gvolpe/tracer/Main.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 Gabriel Volpe
* Copyright 2018-2019 ProfunKtor
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,14 +14,14 @@
* limitations under the License.
*/

package com.github.gvolpe.tracer
package dev.profunktor.tracer

import cats.effect._
import cats.syntax.all._
import cats.temp.par._
import com.github.gvolpe.tracer.Trace.Trace
import com.github.gvolpe.tracer.module._
import com.github.gvolpe.tracer.module.tracer._
import dev.profunktor.tracer.Trace.Trace
import dev.profunktor.tracer.module._
import dev.profunktor.tracer.module.tracer._
import org.http4s.client.blaze.BlazeClientBuilder
import org.http4s.server.blaze.BlazeServerBuilder

Expand Down
Loading

0 comments on commit ce6928e

Please sign in to comment.