Skip to content

Commit d2f36c1

Browse files
committed
change from opentelemetry-api-util to opentelemetry-common
1 parent 84767aa commit d2f36c1

File tree

47 files changed

+63
-59
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+63
-59
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ The OpenTelemetry API for recording telemetry.
7171
| [API](./api/all) | OpenTelemetry API, including metrics, traces, baggage, context | `opentelemetry-api` | <!--VERSION_STABLE-->1.49.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api) |
7272
| [API Incubator](./api/incubator) | API incubator, including pass through propagator, and extended tracer, and Event API | `opentelemetry-api-incubator` | <!--VERSION_UNSTABLE-->1.49.0-alpha<!--/VERSION_UNSTABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api-incubator.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api-incubator) |
7373
| [Context API](./context) | OpenTelemetry context API | `opentelemetry-context` | <!--VERSION_STABLE-->1.49.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-context.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-context) |
74-
| [Util](./api/util) | Common utility methods used across API components | `opentelemetry-util` | <!--VERSION_STABLE-->1.49.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-context.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-context) |
74+
| [Common](./common) | Common utility methods used across API components | `opentelemetry-common` | TODO: add after first publish | TODO: add link after first publish |
7575
</details>
7676

7777
<details>

all/src/test/java/io/opentelemetry/all/SdkDesignTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class SdkDesignTest {
2828
* Ensures that all SDK methods that: - are defined in classes that extend or implement API model
2929
* and are public (to exclude protected builders) - are public (avoids issues with protected
3030
* methods returning classes unavailable to test's CL) - override or implement parent method
31-
* return only API, Context or generic Java type.
31+
* return only API, Context, Common, or generic Java type.
3232
*/
3333
@Test
3434
void sdkImplementationOfApiClassesShouldReturnApiTypeOnly() {
@@ -45,7 +45,11 @@ void sdkImplementationOfApiClassesShouldReturnApiTypeOnly() {
4545
.and(implementOrOverride())
4646
.should()
4747
.haveRawReturnType(
48-
inPackage("io.opentelemetry.api..", "io.opentelemetry.context..", "java.."))
48+
inPackage(
49+
"io.opentelemetry.api..",
50+
"io.opentelemetry.context..",
51+
"io.opentelemetry.common..",
52+
"java.."))
4953
.orShould()
5054
.haveRawReturnType("void");
5155

api/incubator/src/main/java/io/opentelemetry/api/incubator/config/DeclarativeConfigProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static io.opentelemetry.api.internal.ConfigUtil.defaultIfNull;
99

10-
import io.opentelemetry.api.util.ComponentLoader;
10+
import io.opentelemetry.common.ComponentLoader;
1111
import java.util.List;
1212
import java.util.Set;
1313
import javax.annotation.Nullable;

api/incubator/src/main/java/io/opentelemetry/api/incubator/config/EmptyDeclarativeConfigProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.api.incubator.config;
77

8-
import io.opentelemetry.api.util.ComponentLoader;
8+
import io.opentelemetry.common.ComponentLoader;
99
import java.util.Collections;
1010
import java.util.List;
1111
import java.util.Set;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
description = "OpenTelemetry API Common"
9-
otelJava.moduleName.set("io.opentelemetry.api.util")
9+
otelJava.moduleName.set("io.opentelemetry.common")
1010

1111
dependencies {
1212
}

api/util/src/main/java/io/opentelemetry/api/util/ComponentLoader.java renamed to common/src/main/java/io/opentelemetry/common/ComponentLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.api.util;
6+
package io.opentelemetry.common;
77

88
import java.util.ServiceLoader;
99

api/util/src/main/java/io/opentelemetry/api/util/ServiceLoaderComponentLoader.java renamed to common/src/main/java/io/opentelemetry/common/ServiceLoaderComponentLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.api.util;
6+
package io.opentelemetry.common;
77

88
import java.util.ServiceLoader;
99

context/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description = "OpenTelemetry Context (Incubator)"
1010
otelJava.moduleName.set("io.opentelemetry.context")
1111

1212
dependencies {
13-
api(project(":api:util"))
13+
api(project(":common"))
1414
// MustBeClosed
1515
compileOnly("com.google.errorprone:error_prone_annotations")
1616

context/src/main/java/io/opentelemetry/context/LazyStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
package io.opentelemetry.context;
3939

40-
import io.opentelemetry.api.util.ComponentLoader;
40+
import io.opentelemetry.common.ComponentLoader;
4141
import java.util.ArrayList;
4242
import java.util.List;
4343
import java.util.concurrent.atomic.AtomicReference;

docs/apidiffs/current_vs_latest/opentelemetry-api-util.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)