diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpTelemetry-1.1/io.openliberty.mpTelemetry-1.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpTelemetry-1.1/io.openliberty.mpTelemetry-1.1.feature index 314336493279..c45a4e84eae0 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpTelemetry-1.1/io.openliberty.mpTelemetry-1.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpTelemetry-1.1/io.openliberty.mpTelemetry-1.1.feature @@ -12,7 +12,6 @@ IBM-API-Package: \ io.opentelemetry.api;type="third-party",\ io.opentelemetry.api.trace;type="third-party",\ io.opentelemetry.api.common;type="third-party",\ - io.opentelemetry.api.metrics;type="third-party",\ io.opentelemetry.context;type="third-party",\ io.opentelemetry.context.propagation;type="third-party",\ io.opentelemetry.sdk.trace;type="third-party",\ diff --git a/dev/io.openliberty.microprofile.telemetry.1.1.internal/original.bnd b/dev/io.openliberty.microprofile.telemetry.1.1.internal/original.bnd index 7fed8bd1b94c..09f709042ed2 100644 --- a/dev/io.openliberty.microprofile.telemetry.1.1.internal/original.bnd +++ b/dev/io.openliberty.microprofile.telemetry.1.1.internal/original.bnd @@ -25,6 +25,6 @@ Private-Package: \ -dsannotations: \ io.openliberty.microprofile.telemetry11.internal.cdi.SPIMetaData,\ - io.openliberty.microprofile.telemetry20.internal.config.OpenTelemetryVersionedConfigurationImpl,\ + io.openliberty.microprofile.telemetry11.internal.config.OpenTelemetryVersionedConfigurationImpl,\ io.openliberty.microprofile.telemetry11.internal.rest.TelemetryServletContainerInitializer,\ io.openliberty.microprofile.telemetry11.internal.rest.javax.TelemetryJaxRsProviderRegister diff --git a/dev/io.openliberty.microprofile.telemetry.1.1.internal/transformed.bnd b/dev/io.openliberty.microprofile.telemetry.1.1.internal/transformed.bnd index 44d1daf57770..75c2f02a4f40 100644 --- a/dev/io.openliberty.microprofile.telemetry.1.1.internal/transformed.bnd +++ b/dev/io.openliberty.microprofile.telemetry.1.1.internal/transformed.bnd @@ -25,6 +25,6 @@ Private-Package: \ -dsannotations: \ io.openliberty.microprofile.telemetry11.internal.cdi.SPIMetaData,\ - io.openliberty.microprofile.telemetry20.internal.config.OpenTelemetryVersionedConfigurationImpl,\ + io.openliberty.microprofile.telemetry11.internal.config.OpenTelemetryVersionedConfigurationImpl,\ io.openliberty.microprofile.telemetry11.internal.rest.TelemetryServletContainerInitializer,\ io.openliberty.microprofile.telemetry11.internal.rest.jakarta.TelemetryClientBuilderListener diff --git a/dev/io.openliberty.microprofile.telemetry.2.0.internal/src/io/openliberty/microprofile/telemetry20/internal/sdk/OpenTelemetrySdkBuilderSupplierImpl.java b/dev/io.openliberty.microprofile.telemetry.2.0.internal/src/io/openliberty/microprofile/telemetry20/internal/sdk/OpenTelemetrySdkBuilderSupplierImpl.java deleted file mode 100644 index 3f6c63a8ac61..000000000000 --- a/dev/io.openliberty.microprofile.telemetry.2.0.internal/src/io/openliberty/microprofile/telemetry20/internal/sdk/OpenTelemetrySdkBuilderSupplierImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2023 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package io.openliberty.microprofile.telemetry20.internal.sdk; - -import org.osgi.service.component.annotations.Component; - -import io.openliberty.microprofile.telemetry.internal.common.info.OpenTelemetryInfoFactoryImpl; -import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; -import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder; - -/** - * This class contains version specific API calls to AutoConfiguredOpenTelemetrySdk.builder() - */ -@Component -public class OpenTelemetrySdkBuilderSupplierImpl implements OpenTelemetryInfoFactoryImpl.OpenTelemetrySdkBuilderSupplier { - - @Override - public AutoConfiguredOpenTelemetrySdkBuilder getPartiallyConfiguredOpenTelemetrySDKBuilder() { - return AutoConfiguredOpenTelemetrySdk.builder() - .disableShutdownHook(); - } -} diff --git a/dev/io.openliberty.microprofile.telemetry.2.0.internal/src/io/openliberty/microprofile/telemetry20/internal/sdk/package-info.java b/dev/io.openliberty.microprofile.telemetry.2.0.internal/src/io/openliberty/microprofile/telemetry20/internal/sdk/package-info.java deleted file mode 100644 index fe3d9865e9a3..000000000000 --- a/dev/io.openliberty.microprofile.telemetry.2.0.internal/src/io/openliberty/microprofile/telemetry20/internal/sdk/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2023 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -@TraceOptions(traceGroup = "TELEMETRY", messageBundle = "io.openliberty.microprofile.telemetry.internal.common.resources.MPTelemetry") -package io.openliberty.microprofile.telemetry20.internal.sdk; - -import com.ibm.websphere.ras.annotation.TraceOptions; diff --git a/dev/io.openliberty.microprofile.telemetry.internal.common/src/io/openliberty/microprofile/telemetry/internal/common/cdi/OpenTelemetryProducer.java b/dev/io.openliberty.microprofile.telemetry.internal.common/src/io/openliberty/microprofile/telemetry/internal/common/cdi/OpenTelemetryProducer.java index d35660bbba59..11e7a6ef78e9 100644 --- a/dev/io.openliberty.microprofile.telemetry.internal.common/src/io/openliberty/microprofile/telemetry/internal/common/cdi/OpenTelemetryProducer.java +++ b/dev/io.openliberty.microprofile.telemetry.internal.common/src/io/openliberty/microprofile/telemetry/internal/common/cdi/OpenTelemetryProducer.java @@ -22,7 +22,6 @@ import com.ibm.ws.runtime.metadata.ApplicationMetaData; import com.ibm.ws.threadContext.ComponentMetaDataAccessorImpl; -import io.openliberty.microprofile.telemetry.internal.common.helpers.OSGIHelpers; import io.openliberty.microprofile.telemetry.internal.common.info.ErrorOpenTelemetryInfo; import io.openliberty.microprofile.telemetry.internal.common.info.OpenTelemetryInfo; import io.openliberty.microprofile.telemetry.internal.interfaces.OpenTelemetryInfoFactory;