Skip to content

Commit 44c69ea

Browse files
authored
Rename opentelemetry-extension-incubator to opentelemetry-api-incubator, merge opentelemetry-api-events (open-telemetry#6289)
1 parent 7926c45 commit 44c69ea

File tree

90 files changed

+120
-140
lines changed

Some content is hidden

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

90 files changed

+120
-140
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion

README.md

Lines changed: 7 additions & 8 deletions

api/events/build.gradle.kts

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

api/events/gradle.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
description = "OpenTelemetry API Incubator"
10-
otelJava.moduleName.set("io.opentelemetry.extension.incubator")
10+
otelJava.moduleName.set("io.opentelemetry.api.incubator")
1111

1212
dependencies {
1313
api(project(":api:all"))

extensions/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java renamed to api/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java

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

66
package io.opentelemetry.extension.incubator;
77

8+
import io.opentelemetry.api.incubator.propagation.PassThroughPropagator;
89
import io.opentelemetry.api.trace.Span;
910
import io.opentelemetry.api.trace.SpanContext;
1011
import io.opentelemetry.api.trace.TraceFlags;
@@ -13,7 +14,6 @@
1314
import io.opentelemetry.context.Context;
1415
import io.opentelemetry.context.propagation.TextMapGetter;
1516
import io.opentelemetry.context.propagation.TextMapPropagator;
16-
import io.opentelemetry.extension.incubator.propagation.PassThroughPropagator;
1717
import java.util.Collections;
1818
import java.util.HashMap;
1919
import java.util.Map;

api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitter.java renamed to api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitter.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.events;
6+
package io.opentelemetry.api.incubator.events;
77

88
import io.opentelemetry.api.common.Attributes;
99
import java.time.Instant;

api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitterProvider.java renamed to api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterProvider.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.events;
6+
package io.opentelemetry.api.incubator.events;
77

88
class DefaultEventEmitterProvider implements EventEmitterProvider {
99

0 commit comments

Comments
 (0)