-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e395b2f
commit b6cd4b4
Showing
10 changed files
with
173 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,13 @@ | ||
import sbt._ | ||
|
||
object Dependencies { | ||
private[this] val openTelemetryVersion = "1.39.0" | ||
private[this] val openTelemetryAutoConf = "1.38.0" | ||
private[this] val openTelemetryVersion = "1.40.0" | ||
|
||
val `opentelemetry-api` = "io.opentelemetry" % "opentelemetry-api" % openTelemetryVersion | ||
val `opentelemetry-sdk` = "io.opentelemetry" % "opentelemetry-sdk" % openTelemetryVersion | ||
val `opentelemetry-sdk-autoconfigure` = "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % openTelemetryAutoConf | ||
val `opentelemetry-sdk-autoconfigure` = "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % openTelemetryVersion | ||
val `opentelemetry-exporter-otlp` = "io.opentelemetry" % "opentelemetry-exporter-otlp" % openTelemetryVersion | ||
val `spark-core` = "org.apache.spark" %% "spark-core" % "3.5.1" | ||
val scalactic = "org.scalactic" %% "scalactic" % "3.2.19" | ||
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" | ||
} |
12 changes: 12 additions & 0 deletions
12
spot-complete/src/main/scala/com/xebia/data/spot/autoconf/SdkProvider.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package com.xebia.data.spot.autoconf | ||
|
||
import com.xebia.data.spot.OpenTelemetrySdkProvider | ||
import io.opentelemetry.sdk.OpenTelemetrySdk | ||
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk | ||
|
||
class SdkProvider extends OpenTelemetrySdkProvider { | ||
|
||
override def get(config: Map[String, String]): OpenTelemetrySdk = { | ||
AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
...plete/src/test/scala/com/xebia/data/spot/AutoconfiguredOpenTelemetrySdkProviderTest.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package com.xebia.data.spot | ||
|
||
import org.scalatest.flatspec.AnyFlatSpec | ||
import org.scalatest.matchers.should | ||
|
||
class AutoconfiguredOpenTelemetrySdkProviderTest extends AnyFlatSpec with should.Matchers with ConsoleTelemetry { | ||
|
||
behavior of "OpenTelemetrySupport" | ||
|
||
it should "use the AutoConfiguredOpenTelemetrySdk if no config is provided" in { | ||
val uh = new TestOpenTelemetrySupport() | ||
// TODO improve verification; | ||
uh.openTelemetry should not be (null) | ||
} | ||
} | ||
|
||
private[this] class TestOpenTelemetrySupport extends OpenTelemetrySupport { | ||
override def spotConfig: Map[String, String] = Map.empty | ||
} |
19 changes: 19 additions & 0 deletions
19
spot-complete/src/test/scala/com/xebia/data/spot/ConsoleTelemetry.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package com.xebia.data.spot | ||
|
||
import org.scalactic.source.Position | ||
import org.scalatest.{BeforeAndAfter, Suite} | ||
|
||
trait ConsoleTelemetry extends Suite with BeforeAndAfter { | ||
|
||
override protected def before(fun: => Any)(implicit pos: Position): Unit = { | ||
sys.props += "otel.logs.exporter" -> "console" | ||
sys.props += "otel.metrics.exporter" -> "console" | ||
sys.props += "otel.traces.exporter" -> "console" | ||
} | ||
|
||
override protected def after(fun: => Any)(implicit pos: Position): Unit = { | ||
sys.props -= "otel.logs.exporter" | ||
sys.props -= "otel.metrics.exporter" | ||
sys.props -= "otel.traces.exporter" | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
spot/src/main/scala/com/xebia/data/spot/OpenTelemetrySdkProvider.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package com.xebia.data.spot | ||
|
||
import io.opentelemetry.api.OpenTelemetry | ||
|
||
/** | ||
* Enables spot to obtain an OpenTelemetry SDK instance. | ||
*/ | ||
trait OpenTelemetrySdkProvider { | ||
/** | ||
* Returns an instance of [[OpenTelemetry]]. | ||
* | ||
* @param config all SparkConf values. | ||
* @return an instance of [[OpenTelemetry]]. | ||
*/ | ||
def get(config: Map[String, String]): OpenTelemetry | ||
} |
28 changes: 17 additions & 11 deletions
28
spot/src/main/scala/com/xebia/data/spot/OpenTelemetrySupport.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,24 @@ | ||
package com.xebia.data.spot | ||
|
||
import io.opentelemetry.api.GlobalOpenTelemetry | ||
import io.opentelemetry.api.OpenTelemetry | ||
import io.opentelemetry.api.trace.Tracer | ||
import org.apache.spark.SparkConf | ||
|
||
private[spot] trait OpenTelemetrySupport { | ||
def conf: OpenTelemetryConfig = ??? | ||
lazy val tracer: Tracer = ??? | ||
} | ||
/** | ||
* Grants access to an OpenTelemetry instance. | ||
* | ||
* If no configuration is provided, this attempts to load the spot.autoconf.SdkProvider, which is defined in the "spot- | ||
* complete" subproject. If the configuration contains a value for the key 'com.xebia.data.spot.sdkProvider', it | ||
* attempts to load the class indicated by that value. | ||
*/ | ||
trait OpenTelemetrySupport { | ||
def spotConfig: Map[String, String] | ||
|
||
private[spot] case class OpenTelemetryConfig() { | ||
val openTelemetry: OpenTelemetry = { | ||
val provFQCN = spotConfig.getOrElse("com.xebia.data.spot.sdkProvider", "com.xebia.data.spot.autoconf.SdkProvider") | ||
val provClass = java.lang.Class.forName(provFQCN) | ||
val provider = provClass.getDeclaredConstructor().newInstance().asInstanceOf[OpenTelemetrySdkProvider] | ||
provider.get(spotConfig) | ||
} | ||
|
||
} | ||
|
||
private[spot] object OpenTelemetryConfig { | ||
def from(conf: SparkConf): OpenTelemetryConfig = ??? | ||
lazy val tracer: Tracer = ??? | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
spot/src/test/scala/com/xebia/data/spot/OpenTelemetrySupportTest.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package com.xebia.data.spot | ||
|
||
import io.opentelemetry.api.OpenTelemetry | ||
import org.scalatest.flatspec.AnyFlatSpec | ||
import org.scalatest.matchers.should | ||
|
||
class OpenTelemetrySupportTest extends AnyFlatSpec with should.Matchers { | ||
|
||
behavior of "OpenTelemetrySupport" | ||
|
||
it should "reflectively create an SDK provider based on 'spot.sdkProvider' config" in { | ||
val uh = new NoopOpenTelemetrySupport("com.xebia.data.spot.sdkProvider" -> classOf[NoopSdkProvider].getName) | ||
uh.openTelemetry should be theSameInstanceAs OpenTelemetry.noop() | ||
} | ||
} | ||
|
||
class NoopOpenTelemetrySupport(config: (String, String)*) extends OpenTelemetrySupport { | ||
override def spotConfig: Map[String, String] = Map(config:_*) | ||
} | ||
|
||
class NoopSdkProvider extends OpenTelemetrySdkProvider { | ||
override def get(config: Map[String, String]): OpenTelemetry = OpenTelemetry.noop() | ||
} |