Rename library-api artifact to instrumentation-api (open-telemetry#969)

mateuszrzeszutek · Aug 14, 2020 · f46ba88 · f46ba88
1 parent 72cfac2
commit f46ba88
Show file tree

Hide file tree

Showing 85 changed files with 9 additions and 9 deletions.
diff --git a/auto-api/auto-api.gradle b/auto-api/auto-api.gradle
@@ -7,7 +7,7 @@ dependencies {
  api deps.opentelemetryApi
  compileOnly deps.opentelemetrySdk
  implementation deps.slf4j
- implementation project(':library-api')
+ implementation project(':instrumentation-api')
 
  testImplementation project(':testing-common')
  testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'

diff --git a/gradle/instrumentation-library.gradle b/gradle/instrumentation-library.gradle
@@ -6,7 +6,7 @@ apply from: "$rootDir/gradle/publish.gradle"
 archivesBaseName = projectDir.parentFile.name
 
 dependencies {
- api project(':library-api')
+ api project(':instrumentation-api')
 
  api deps.opentelemetryApi
 

diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle
@@ -36,7 +36,7 @@ afterEvaluate {
  }
 
  dependencies {
- implementation project(':library-api')
+ implementation project(':instrumentation-api')
  implementation project(':auto-api')
  // Apply common dependencies for instrumentation.
  implementation(project(':javaagent-tooling')) {

diff --git a/library-api/library-api.gradle → ...umentation-api/instrumentation-api.gradle b/library-api/library-api.gradle → ...umentation-api/instrumentation-api.gradle
diff --git a/...y/instrumentation/api/MoreAttributes.java → ...y/instrumentation/api/MoreAttributes.java b/...y/instrumentation/api/MoreAttributes.java → ...y/instrumentation/api/MoreAttributes.java
diff --git a/...ry/instrumentation/api/config/Config.java → ...ry/instrumentation/api/config/Config.java b/...ry/instrumentation/api/config/Config.java → ...ry/instrumentation/api/config/Config.java
diff --git a/...pi/config/MethodsConfigurationParser.java → ...pi/config/MethodsConfigurationParser.java b/...pi/config/MethodsConfigurationParser.java → ...pi/config/MethodsConfigurationParser.java
diff --git a/...entation/api/decorator/BaseDecorator.java → ...entation/api/decorator/BaseDecorator.java b/...entation/api/decorator/BaseDecorator.java → ...entation/api/decorator/BaseDecorator.java
diff --git a/...rumentation/api/decorator/BaseTracer.java → ...rumentation/api/decorator/BaseTracer.java b/...rumentation/api/decorator/BaseTracer.java → ...rumentation/api/decorator/BaseTracer.java
diff --git a/...tation/api/decorator/ClientDecorator.java → ...tation/api/decorator/ClientDecorator.java b/...tation/api/decorator/ClientDecorator.java → ...tation/api/decorator/ClientDecorator.java
diff --git a/...pi/decorator/DatabaseClientDecorator.java → ...pi/decorator/DatabaseClientDecorator.java b/...pi/decorator/DatabaseClientDecorator.java → ...pi/decorator/DatabaseClientDecorator.java
diff --git a/...n/api/decorator/DatabaseClientTracer.java → ...n/api/decorator/DatabaseClientTracer.java b/...n/api/decorator/DatabaseClientTracer.java → ...n/api/decorator/DatabaseClientTracer.java
diff --git a/...on/api/decorator/HttpClientDecorator.java → ...on/api/decorator/HttpClientDecorator.java b/...on/api/decorator/HttpClientDecorator.java → ...on/api/decorator/HttpClientDecorator.java
diff --git a/...ation/api/decorator/HttpClientTracer.java → ...ation/api/decorator/HttpClientTracer.java b/...ation/api/decorator/HttpClientTracer.java → ...ation/api/decorator/HttpClientTracer.java
diff --git a/...ation/api/decorator/HttpServerTracer.java → ...ation/api/decorator/HttpServerTracer.java b/...ation/api/decorator/HttpServerTracer.java → ...ation/api/decorator/HttpServerTracer.java
diff --git a/...on/api/decorator/HttpStatusConverter.java → ...on/api/decorator/HttpStatusConverter.java b/...on/api/decorator/HttpStatusConverter.java → ...on/api/decorator/HttpStatusConverter.java
diff --git a/...ion/api/decorator/OrmClientDecorator.java → ...ion/api/decorator/OrmClientDecorator.java b/...ion/api/decorator/OrmClientDecorator.java → ...ion/api/decorator/OrmClientDecorator.java
diff --git a/...tation/api/decorator/ServerDecorator.java → ...tation/api/decorator/ServerDecorator.java b/...tation/api/decorator/ServerDecorator.java → ...tation/api/decorator/ServerDecorator.java
diff --git a/...edspan/DbCassandraSemanticConvention.java → ...edspan/DbCassandraSemanticConvention.java b/...edspan/DbCassandraSemanticConvention.java → ...edspan/DbCassandraSemanticConvention.java
diff --git a/...tation/api/typedspan/DbCassandraSpan.java → ...tation/api/typedspan/DbCassandraSpan.java b/...tation/api/typedspan/DbCassandraSpan.java → ...tation/api/typedspan/DbCassandraSpan.java
diff --git a/.../typedspan/DbHbaseSemanticConvention.java → .../typedspan/DbHbaseSemanticConvention.java b/.../typedspan/DbHbaseSemanticConvention.java → .../typedspan/DbHbaseSemanticConvention.java
diff --git a/...umentation/api/typedspan/DbHbaseSpan.java → ...umentation/api/typedspan/DbHbaseSpan.java b/...umentation/api/typedspan/DbHbaseSpan.java → ...umentation/api/typedspan/DbHbaseSpan.java
diff --git a/...ypedspan/DbMongodbSemanticConvention.java → ...ypedspan/DbMongodbSemanticConvention.java b/...ypedspan/DbMongodbSemanticConvention.java → ...ypedspan/DbMongodbSemanticConvention.java
diff --git a/...entation/api/typedspan/DbMongodbSpan.java → ...entation/api/typedspan/DbMongodbSpan.java b/...entation/api/typedspan/DbMongodbSpan.java → ...entation/api/typedspan/DbMongodbSpan.java
diff --git a/.../typedspan/DbMssqlSemanticConvention.java → .../typedspan/DbMssqlSemanticConvention.java b/.../typedspan/DbMssqlSemanticConvention.java → .../typedspan/DbMssqlSemanticConvention.java
diff --git a/...umentation/api/typedspan/DbMssqlSpan.java → ...umentation/api/typedspan/DbMssqlSpan.java b/...umentation/api/typedspan/DbMssqlSpan.java → ...umentation/api/typedspan/DbMssqlSpan.java
diff --git a/.../typedspan/DbRedisSemanticConvention.java → .../typedspan/DbRedisSemanticConvention.java b/.../typedspan/DbRedisSemanticConvention.java → .../typedspan/DbRedisSemanticConvention.java
diff --git a/...umentation/api/typedspan/DbRedisSpan.java → ...umentation/api/typedspan/DbRedisSpan.java b/...umentation/api/typedspan/DbRedisSpan.java → ...umentation/api/typedspan/DbRedisSpan.java
diff --git a/...n/api/typedspan/DbSemanticConvention.java → ...n/api/typedspan/DbSemanticConvention.java b/...n/api/typedspan/DbSemanticConvention.java → ...n/api/typedspan/DbSemanticConvention.java
diff --git a/...instrumentation/api/typedspan/DbSpan.java → ...instrumentation/api/typedspan/DbSpan.java b/...instrumentation/api/typedspan/DbSpan.java → ...instrumentation/api/typedspan/DbSpan.java
diff --git a/...ntation/api/typedspan/DelegatingSpan.java → ...ntation/api/typedspan/DelegatingSpan.java b/...ntation/api/typedspan/DelegatingSpan.java → ...ntation/api/typedspan/DelegatingSpan.java
diff --git a/...pan/FaasDatasourceSemanticConvention.java → ...pan/FaasDatasourceSemanticConvention.java b/...pan/FaasDatasourceSemanticConvention.java → ...pan/FaasDatasourceSemanticConvention.java
diff --git a/...ion/api/typedspan/FaasDatasourceSpan.java → ...ion/api/typedspan/FaasDatasourceSpan.java b/...ion/api/typedspan/FaasDatasourceSpan.java → ...ion/api/typedspan/FaasDatasourceSpan.java
diff --git a/...typedspan/FaasHttpSemanticConvention.java → ...typedspan/FaasHttpSemanticConvention.java b/...typedspan/FaasHttpSemanticConvention.java → ...typedspan/FaasHttpSemanticConvention.java
diff --git a/...mentation/api/typedspan/FaasHttpSpan.java → ...mentation/api/typedspan/FaasHttpSpan.java b/...mentation/api/typedspan/FaasHttpSpan.java → ...mentation/api/typedspan/FaasHttpSpan.java
diff --git a/...pedspan/FaasPubsubSemanticConvention.java → ...pedspan/FaasPubsubSemanticConvention.java b/...pedspan/FaasPubsubSemanticConvention.java → ...pedspan/FaasPubsubSemanticConvention.java
diff --git a/...ntation/api/typedspan/FaasPubsubSpan.java → ...ntation/api/typedspan/FaasPubsubSpan.java b/...ntation/api/typedspan/FaasPubsubSpan.java → ...ntation/api/typedspan/FaasPubsubSpan.java
diff --git a/...typedspan/FaasSpanSemanticConvention.java → ...typedspan/FaasSpanSemanticConvention.java b/...typedspan/FaasSpanSemanticConvention.java → ...typedspan/FaasSpanSemanticConvention.java
diff --git a/...mentation/api/typedspan/FaasSpanSpan.java → ...mentation/api/typedspan/FaasSpanSpan.java b/...mentation/api/typedspan/FaasSpanSpan.java → ...mentation/api/typedspan/FaasSpanSpan.java
diff --git a/...ypedspan/FaasTimerSemanticConvention.java → ...ypedspan/FaasTimerSemanticConvention.java b/...ypedspan/FaasTimerSemanticConvention.java → ...ypedspan/FaasTimerSemanticConvention.java
diff --git a/...entation/api/typedspan/FaasTimerSpan.java → ...entation/api/typedspan/FaasTimerSpan.java b/...entation/api/typedspan/FaasTimerSpan.java → ...entation/api/typedspan/FaasTimerSpan.java
diff --git a/...pedspan/GrpcClientSemanticConvention.java → ...pedspan/GrpcClientSemanticConvention.java b/...pedspan/GrpcClientSemanticConvention.java → ...pedspan/GrpcClientSemanticConvention.java
diff --git a/...ntation/api/typedspan/GrpcClientSpan.java → ...ntation/api/typedspan/GrpcClientSpan.java b/...ntation/api/typedspan/GrpcClientSpan.java → ...ntation/api/typedspan/GrpcClientSpan.java
diff --git a/...pedspan/GrpcServerSemanticConvention.java → ...pedspan/GrpcServerSemanticConvention.java b/...pedspan/GrpcServerSemanticConvention.java → ...pedspan/GrpcServerSemanticConvention.java
diff --git a/...ntation/api/typedspan/GrpcServerSpan.java → ...ntation/api/typedspan/GrpcServerSpan.java b/...ntation/api/typedspan/GrpcServerSpan.java → ...ntation/api/typedspan/GrpcServerSpan.java
diff --git a/...pedspan/HttpClientSemanticConvention.java → ...pedspan/HttpClientSemanticConvention.java b/...pedspan/HttpClientSemanticConvention.java → ...pedspan/HttpClientSemanticConvention.java
diff --git a/...ntation/api/typedspan/HttpClientSpan.java → ...ntation/api/typedspan/HttpClientSpan.java b/...ntation/api/typedspan/HttpClientSpan.java → ...ntation/api/typedspan/HttpClientSpan.java
diff --git a/...api/typedspan/HttpSemanticConvention.java → ...api/typedspan/HttpSemanticConvention.java b/...api/typedspan/HttpSemanticConvention.java → ...api/typedspan/HttpSemanticConvention.java
diff --git a/...pedspan/HttpServerSemanticConvention.java → ...pedspan/HttpServerSemanticConvention.java b/...pedspan/HttpServerSemanticConvention.java → ...pedspan/HttpServerSemanticConvention.java
diff --git a/...ntation/api/typedspan/HttpServerSpan.java → ...ntation/api/typedspan/HttpServerSpan.java b/...ntation/api/typedspan/HttpServerSpan.java → ...ntation/api/typedspan/HttpServerSpan.java
diff --git a/...strumentation/api/typedspan/HttpSpan.java → ...strumentation/api/typedspan/HttpSpan.java b/...strumentation/api/typedspan/HttpSpan.java → ...strumentation/api/typedspan/HttpSpan.java
diff --git a/...typedspan/IdentitySemanticConvention.java → ...typedspan/IdentitySemanticConvention.java b/...typedspan/IdentitySemanticConvention.java → ...typedspan/IdentitySemanticConvention.java
diff --git a/...mentation/api/typedspan/IdentitySpan.java → ...mentation/api/typedspan/IdentitySpan.java b/...mentation/api/typedspan/IdentitySpan.java → ...mentation/api/typedspan/IdentitySpan.java
diff --git a/.../MessagingConsumerSemanticConvention.java → .../MessagingConsumerSemanticConvention.java b/.../MessagingConsumerSemanticConvention.java → .../MessagingConsumerSemanticConvention.java
diff --git a/.../api/typedspan/MessagingConsumerSpan.java → .../api/typedspan/MessagingConsumerSpan.java b/.../api/typedspan/MessagingConsumerSpan.java → .../api/typedspan/MessagingConsumerSpan.java
diff --git a/...onsumerSynchronousSemanticConvention.java → ...onsumerSynchronousSemanticConvention.java b/...onsumerSynchronousSemanticConvention.java → ...onsumerSynchronousSemanticConvention.java
diff --git a/...pan/MessagingConsumerSynchronousSpan.java → ...pan/MessagingConsumerSynchronousSpan.java b/...pan/MessagingConsumerSynchronousSpan.java → ...pan/MessagingConsumerSynchronousSpan.java
diff --git a/.../MessagingProducerSemanticConvention.java → .../MessagingProducerSemanticConvention.java b/.../MessagingProducerSemanticConvention.java → .../MessagingProducerSemanticConvention.java
diff --git a/.../api/typedspan/MessagingProducerSpan.java → .../api/typedspan/MessagingProducerSpan.java b/.../api/typedspan/MessagingProducerSpan.java → .../api/typedspan/MessagingProducerSpan.java
diff --git a/...roducerSynchronousSemanticConvention.java → ...roducerSynchronousSemanticConvention.java b/...roducerSynchronousSemanticConvention.java → ...roducerSynchronousSemanticConvention.java
diff --git a/...pan/MessagingProducerSynchronousSpan.java → ...pan/MessagingProducerSynchronousSpan.java b/...pan/MessagingProducerSynchronousSpan.java → ...pan/MessagingProducerSynchronousSpan.java
diff --git a/...ypedspan/MessagingSemanticConvention.java → ...ypedspan/MessagingSemanticConvention.java b/...ypedspan/MessagingSemanticConvention.java → ...ypedspan/MessagingSemanticConvention.java
diff --git a/...entation/api/typedspan/MessagingSpan.java → ...entation/api/typedspan/MessagingSpan.java b/...entation/api/typedspan/MessagingSpan.java → ...entation/api/typedspan/MessagingSpan.java
diff --git a/.../typedspan/NetworkSemanticConvention.java → .../typedspan/NetworkSemanticConvention.java b/.../typedspan/NetworkSemanticConvention.java → .../typedspan/NetworkSemanticConvention.java
diff --git a/...umentation/api/typedspan/NetworkSpan.java → ...umentation/api/typedspan/NetworkSpan.java b/...umentation/api/typedspan/NetworkSpan.java → ...umentation/api/typedspan/NetworkSpan.java
diff --git a/.../api/typedspan/RpcSemanticConvention.java → .../api/typedspan/RpcSemanticConvention.java b/.../api/typedspan/RpcSemanticConvention.java → .../api/typedspan/RpcSemanticConvention.java
diff --git a/...nstrumentation/api/typedspan/RpcSpan.java → ...nstrumentation/api/typedspan/RpcSpan.java b/...nstrumentation/api/typedspan/RpcSpan.java → ...nstrumentation/api/typedspan/RpcSpan.java
diff --git a/...trumentation/api/config/ConfigTest.groovy → ...trumentation/api/config/ConfigTest.groovy b/...trumentation/api/config/ConfigTest.groovy → ...trumentation/api/config/ConfigTest.groovy
diff --git a/...fig/MethodsConfigurationParserTest.groovy → ...fig/MethodsConfigurationParserTest.groovy b/...fig/MethodsConfigurationParserTest.groovy → ...fig/MethodsConfigurationParserTest.groovy
diff --git a/...on/api/decorator/BaseDecoratorTest.groovy → ...on/api/decorator/BaseDecoratorTest.groovy b/...on/api/decorator/BaseDecoratorTest.groovy → ...on/api/decorator/BaseDecoratorTest.groovy
diff --git a/.../api/decorator/ClientDecoratorTest.groovy → .../api/decorator/ClientDecoratorTest.groovy b/.../api/decorator/ClientDecoratorTest.groovy → .../api/decorator/ClientDecoratorTest.groovy
diff --git a/...orator/DatabaseClientDecoratorTest.groovy → ...orator/DatabaseClientDecoratorTest.groovy b/...orator/DatabaseClientDecoratorTest.groovy → ...orator/DatabaseClientDecoratorTest.groovy
diff --git a/.../decorator/HttpClientDecoratorTest.groovy → .../decorator/HttpClientDecoratorTest.groovy b/.../decorator/HttpClientDecoratorTest.groovy → .../decorator/HttpClientDecoratorTest.groovy
diff --git a/.../decorator/HttpStatusConverterTest.groovy → .../decorator/HttpStatusConverterTest.groovy b/.../decorator/HttpStatusConverterTest.groovy → .../decorator/HttpStatusConverterTest.groovy
diff --git a/...i/decorator/OrmClientDecoratorTest.groovy → ...i/decorator/OrmClientDecoratorTest.groovy b/...i/decorator/OrmClientDecoratorTest.groovy → ...i/decorator/OrmClientDecoratorTest.groovy
diff --git a/.../api/decorator/ServerDecoratorTest.groovy → .../api/decorator/ServerDecoratorTest.groovy b/.../api/decorator/ServerDecoratorTest.groovy → .../api/decorator/ServerDecoratorTest.groovy
diff --git a/...n/api/decorator/HttpServerTracerTest.java → ...n/api/decorator/HttpServerTracerTest.java b/...n/api/decorator/HttpServerTracerTest.java → ...n/api/decorator/HttpServerTracerTest.java
diff --git a/...tation/api/decorator/SampleJavaClass.java → ...tation/api/decorator/SampleJavaClass.java b/...tation/api/decorator/SampleJavaClass.java → ...tation/api/decorator/SampleJavaClass.java
diff --git a/...src/test/resources/java-tracer.properties → ...src/test/resources/java-tracer.properties b/...src/test/resources/java-tracer.properties → ...src/test/resources/java-tracer.properties
diff --git a/instrumentation/instrumentation.gradle b/instrumentation/instrumentation.gradle
@@ -34,7 +34,7 @@ subprojects {
 }
 
 dependencies {
- implementation project(':library-api')
+ implementation project(':instrumentation-api')
  implementation project(':auto-api')
  implementation(project(':javaagent-tooling')) {
  exclude module: ':javaagent-bootstrap'

diff --git a/javaagent-bootstrap/javaagent-bootstrap.gradle b/javaagent-bootstrap/javaagent-bootstrap.gradle
@@ -14,7 +14,7 @@ dependencies {
  implementation group: 'org.slf4j', name: 'slf4j-simple', version: versions.slf4j
  // ^ Generally a bad idea for libraries, but we're shadowing.
 
- implementation project(':library-api')
+ implementation project(':instrumentation-api')
  implementation project(':auto-api')
 
  testImplementation project(':testing-common')

diff --git a/javaagent-tooling/javaagent-tooling.gradle b/javaagent-tooling/javaagent-tooling.gradle
@@ -15,7 +15,7 @@ configurations {
 dependencies {
  implementation project(':javaagent-bootstrap')
  implementation project(':auto-api')
- implementation project(':library-api')
+ implementation project(':instrumentation-api')
  implementation project(':utils:thread-utils')
 
  implementation deps.opentelemetryApi

diff --git a/javaagent/javaagent.gradle b/javaagent/javaagent.gradle
@@ -97,7 +97,7 @@ tasks.withType(ShadowJar).configureEach {
 dependencies {
  testImplementation project(':javaagent-bootstrap')
  testImplementation project(':auto-api')
- testImplementation project(':library-api')
+ testImplementation project(':instrumentation-api')
  testImplementation project(':utils:test-utils')
 
  testImplementation deps.testLogging

diff --git a/settings.gradle b/settings.gradle
@@ -28,7 +28,7 @@ include ':javaagent-tooling'
 include ':javaagent'
 include ':load-generator'
 
-include ':library-api'
+include ':instrumentation-api'
 include ':auto-api'
 
 // misc

diff --git a/testing-common/testing-common.gradle b/testing-common/testing-common.gradle
@@ -36,7 +36,7 @@ dependencies {
 
  implementation project(':javaagent-bootstrap')
  implementation project(':auto-api')
- implementation project(':library-api')
+ implementation project(':instrumentation-api')
  implementation(project(':javaagent-tooling')) {
  // including :opentelemetry-sdk-shaded-for-testing above instead
  exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'