From 0121a432899de7149baadd394d250f88580510fb Mon Sep 17 00:00:00 2001 From: yasmin-aumeeruddy Date: Fri, 12 Apr 2024 15:43:50 +0100 Subject: [PATCH 1/2] Add logs TCK --- tck/logs/README.adoc | 110 ++++++++++ tck/logs/pom.xml | 136 ++++++++++++ .../telemetry/logs/tck/ConfigAsset.java | 53 +++++ .../telemetry/logs/tck/TestLibraries.java | 32 +++ .../logs/tck/application/LogAppenderTest.java | 76 +++++++ .../exporter/InMemoryLogRecordExporter.java | 80 +++++++ .../InMemoryLogRecordExporterProvider.java | 37 ++++ tck/logs/src/main/resources/META-INF/LICENSE | 201 ++++++++++++++++++ tck/logs/src/main/resources/META-INF/NOTICE | 19 ++ tck/logs/src/main/resources/META-INF/tck | 0 tck/pom.xml | 1 + 11 files changed, 745 insertions(+) create mode 100644 tck/logs/README.adoc create mode 100644 tck/logs/pom.xml create mode 100644 tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/ConfigAsset.java create mode 100644 tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/TestLibraries.java create mode 100644 tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java create mode 100644 tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/exporter/InMemoryLogRecordExporter.java create mode 100644 tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/exporter/InMemoryLogRecordExporterProvider.java create mode 100644 tck/logs/src/main/resources/META-INF/LICENSE create mode 100644 tck/logs/src/main/resources/META-INF/NOTICE create mode 100644 tck/logs/src/main/resources/META-INF/tck diff --git a/tck/logs/README.adoc b/tck/logs/README.adoc new file mode 100644 index 00000000..dc2cda3a --- /dev/null +++ b/tck/logs/README.adoc @@ -0,0 +1,110 @@ +// +// Copyright (c) 2024 Contributors to the Eclipse Foundation +// +// See the NOTICE file(s) distributed with this work for additional +// information regarding copyright ownership. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + += MicroProfile Telemetry logs TCK +Any MicroProfile Telemetry implementation must pass this test suite. +The TCK uses `TestNG` and `Arquillian`. + +== Hardware Requirements +All systems should meet the following recommended hardware requirements: + + * CPU running at 2.0 GHz or higher + * 4 GB of RAM or more + * Network access to the Internet + +== Software Requirements +You can run this TCK on platforms running the Solaris, Linux, Windows, and Mac OS with the following software installed: + + * Maven + * JDK11+ + +== Dependencies +To enable the tests in your project you need to add the following dependency to your build: + +[source, xml] +---- + + + org.eclipse.microprofile.telemetry + microprofile-telemetry-logs-tck + 1.0 + test + + +---- + +If you want to run the logs tests, you can specify all tests in the `tck-suite.xml`. E.g. + +[source, xml] +---- + + + + + + + + + +---- + +== Configuration in Apache Maven pom.xml +If you use Apache Maven then the tests are run via the `maven-surefire-plugin` + +[source, xml] +---- + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + tck-suite.xml + + + + + +---- + +== Running as a Scanned Dependency +You can also run the TCK as a scanned dependency. + +=== Surefire Configuration in your pom.xml +Once you've added the dependency, you don't need a `tck-suite.xml` you can just scan the dependency for tests. + +[source, xml] +---- + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + org.eclipse.microprofile.telemetry:microprofile-telemetry-logs-tck + + + + + +---- diff --git a/tck/logs/pom.xml b/tck/logs/pom.xml new file mode 100644 index 00000000..1c936ab0 --- /dev/null +++ b/tck/logs/pom.xml @@ -0,0 +1,136 @@ + + + + 4.0.0 + + + org.eclipse.microprofile.telemetry + microprofile-telemetry-tck-parent + 1.2-SNAPSHOT + + + microprofile-telemetry-logs-tck + MicroProfile Telemetry logs TCK + + + + org.eclipse.microprofile.config + microprofile-config-api + + + org.eclipse.microprofile.rest.client + microprofile-rest-client-api + + + jakarta.enterprise + jakarta.enterprise.cdi-api + + + jakarta.ws.rs + jakarta.ws.rs-api + + + io.opentelemetry + opentelemetry-sdk + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure + + + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api + 3.0.3 + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-annotations + + + io.opentelemetry.semconv + opentelemetry-semconv + ${version.otel.semconv} + + + + io.opentelemetry.instrumentation + opentelemetry-logback-appender-1.0 + 2.2.0-alpha + + + + ch.qos.logback + logback-classic + 1.5.5 + + + + org.slf4j + jul-to-slf4j + 2.0.13 + + + + org.testng + testng + + + org.jboss.arquillian.testng + arquillian-testng-container + + + org.jboss.shrinkwrap + shrinkwrap-api + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-api-maven + + + org.awaitility + awaitility + ${version.awaitility} + + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + ${version.plugin.copy.rename} + + + copy-readme + prepare-package + + copy + + + ../README.adoc + target/classes/README.adoc + + + + + + + diff --git a/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/ConfigAsset.java b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/ConfigAsset.java new file mode 100644 index 00000000..b9d10c03 --- /dev/null +++ b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/ConfigAsset.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2024 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.eclipse.microprofile.telemetry.logs.tck; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +import org.jboss.shrinkwrap.api.asset.Asset; + +public class ConfigAsset implements Asset { + + public static final String SDK_DISABLED = "otel.sdk.disabled"; + + private Properties properties = new Properties(); + + @Override + public InputStream openStream() { + try { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + properties.store(os, null); + return new ByteArrayInputStream(os.toByteArray()); + } catch (IOException e) { + // Shouldn't happen since we're only using in memory streams + throw new RuntimeException("Unexpected error saving properties", e); + } + } + + public ConfigAsset add(String key, String value) { + properties.put(key, value); + return this; + } + +} diff --git a/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/TestLibraries.java b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/TestLibraries.java new file mode 100644 index 00000000..1fff22dd --- /dev/null +++ b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/TestLibraries.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2024 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.eclipse.microprofile.telemetry.logs.tck; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; + +public class TestLibraries { + + public static final JavaArchive AWAITILITY_LIB = ShrinkWrap.create(JavaArchive.class, "awaitility.jar") + .addPackages(true, "org.awaitility", "org.hamcrest"); + + private TestLibraries() { + } +} diff --git a/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java new file mode 100644 index 00000000..6317011e --- /dev/null +++ b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2016-2024 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.eclipse.microprofile.telemetry.logs.tck.application; + +import java.util.logging.Logger; + +import org.eclipse.microprofile.telemetry.logs.tck.TestLibraries; +import org.eclipse.microprofile.telemetry.logs.tck.exporter.InMemoryLogRecordExporter; +import org.eclipse.microprofile.telemetry.logs.tck.exporter.InMemoryLogRecordExporterProvider; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.testng.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.slf4j.bridge.SLF4JBridgeHandler; +import org.testng.Assert; +import org.testng.annotations.Test; + +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender; +import io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider; +import jakarta.inject.Inject; + +public class LogAppenderTest extends Arquillian { + @Deployment + public static WebArchive createDeployment() { + return ShrinkWrap.create(WebArchive.class) + .addClasses(InMemoryLogRecordExporter.class, InMemoryLogRecordExporterProvider.class) + .addAsLibrary(TestLibraries.AWAITILITY_LIB) + .addAsServiceProvider(ConfigurableLogRecordExporterProvider.class, + InMemoryLogRecordExporterProvider.class) + .addAsResource(new StringAsset( + "otel.sdk.disabled=false\notel.metrics.exporter=\notel.traces.exporter=none\notel.logs.exporter=in-memory"), + "META-INF/microprofile-config.properties") + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } + + @Inject + private OpenTelemetry openTelemetry; + + @Inject + private InMemoryLogRecordExporter memoryExporter; + + private static final java.util.logging.Logger julLogger = Logger.getLogger("jul-logger"); + + @Test + void julTest() throws InterruptedException { + // Install OpenTelemetry in logback appender + OpenTelemetryAppender.install(openTelemetry); + + // Route JUL logs to slf4j + SLF4JBridgeHandler.removeHandlersForRootLogger(); + SLF4JBridgeHandler.install(); + julLogger.info("A JUL log message"); + Assert.assertEquals(memoryExporter.getFinishedLogRecordItems(1).get(0).getBody(), "A JUL log message"); + } +} diff --git a/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/exporter/InMemoryLogRecordExporter.java b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/exporter/InMemoryLogRecordExporter.java new file mode 100644 index 00000000..6bdad7fe --- /dev/null +++ b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/exporter/InMemoryLogRecordExporter.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2024 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.eclipse.microprofile.telemetry.logs.tck.exporter; + +import static java.util.concurrent.TimeUnit.SECONDS; + +import java.util.Collection; +import java.util.List; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.stream.Collectors; + +import org.awaitility.Awaitility; +import org.testng.Assert; + +import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.logs.data.LogRecordData; +import io.opentelemetry.sdk.logs.export.LogRecordExporter; +import jakarta.enterprise.context.ApplicationScoped; + +@ApplicationScoped +public class InMemoryLogRecordExporter implements LogRecordExporter { + private boolean isStopped = false; + private final Queue finishedLogItems = new ConcurrentLinkedQueue<>(); + + public void reset() { + finishedLogItems.clear(); + } + + @Override + public CompletableResultCode export(Collection logs) { + if (isStopped) { + return CompletableResultCode.ofFailure(); + } + logs.stream() + .forEach(finishedLogItems::add); + return CompletableResultCode.ofSuccess(); + } + + public List getFinishedLogRecordItems(int itemCount) { + assertItemCount(itemCount); + return finishedLogItems.stream() + .collect(Collectors.toList()); + } + + public void assertItemCount(int itemCount) { + Awaitility.await().pollDelay(3, SECONDS).atMost(10, SECONDS) + .untilAsserted(() -> Assert.assertEquals(finishedLogItems.size(), itemCount)); + } + + @Override + public CompletableResultCode flush() { + return CompletableResultCode.ofSuccess(); + } + + @Override + public CompletableResultCode shutdown() { + finishedLogItems.clear(); + isStopped = true; + return CompletableResultCode.ofSuccess(); + } +} diff --git a/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/exporter/InMemoryLogRecordExporterProvider.java b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/exporter/InMemoryLogRecordExporterProvider.java new file mode 100644 index 00000000..a394608f --- /dev/null +++ b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/exporter/InMemoryLogRecordExporterProvider.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2024 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.eclipse.microprofile.telemetry.logs.tck.exporter; + +import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; +import io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider; +import io.opentelemetry.sdk.logs.export.LogRecordExporter; +import jakarta.enterprise.inject.spi.CDI; + +public class InMemoryLogRecordExporterProvider implements ConfigurableLogRecordExporterProvider { + @Override + public LogRecordExporter createExporter(final ConfigProperties config) { + return CDI.current().select(InMemoryLogRecordExporter.class).get(); + } + + @Override + public String getName() { + return "in-memory"; + } +} diff --git a/tck/logs/src/main/resources/META-INF/LICENSE b/tck/logs/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000..8dada3ed --- /dev/null +++ b/tck/logs/src/main/resources/META-INF/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/tck/logs/src/main/resources/META-INF/NOTICE b/tck/logs/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000..b5b6dc89 --- /dev/null +++ b/tck/logs/src/main/resources/META-INF/NOTICE @@ -0,0 +1,19 @@ +========================================================================= +== NOTICE file corresponding to section 4(d) of the Apache License, == +== Version 2.0, in this case for MicroProfile Telemetry == +========================================================================= + +SPDXVersion: SPDX-2.1 +PackageName: MicroProfile +PackageHomePage: http://www.eclipse.org/microprofile +PackageLicenseDeclared: Apache-2.0 + +PackageCopyrightText: +Roberto Cortez, +Emily Jiang, +Bruno Baptista, +Jan Westerkamp, +Felix Wong, +Yasmin Aumeeruddy, +Patrik Duditš + \ No newline at end of file diff --git a/tck/logs/src/main/resources/META-INF/tck b/tck/logs/src/main/resources/META-INF/tck new file mode 100644 index 00000000..e69de29b diff --git a/tck/pom.xml b/tck/pom.xml index 930914f0..a5d847d9 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -30,6 +30,7 @@ tracing metrics + logs From 0e0d56bd4067ebf84f5c9259491b6ed9f10b8fc3 Mon Sep 17 00:00:00 2001 From: yasmin-aumeeruddy Date: Tue, 30 Apr 2024 15:42:37 +0100 Subject: [PATCH 2/2] Update pom for logs TCK --- tck/logs/pom.xml | 16 +++++----------- .../logs/tck/application/LogAppenderTest.java | 3 ++- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/tck/logs/pom.xml b/tck/logs/pom.xml index 1c936ab0..703bbf6c 100644 --- a/tck/logs/pom.xml +++ b/tck/logs/pom.xml @@ -50,11 +50,6 @@ io.opentelemetry opentelemetry-sdk-extension-autoconfigure - - jakarta.enterprise.concurrent - jakarta.enterprise.concurrent-api - 3.0.3 - io.opentelemetry.instrumentation opentelemetry-instrumentation-annotations @@ -77,12 +72,11 @@ 1.5.5 - - org.slf4j - jul-to-slf4j - 2.0.13 - - + + org.slf4j + jul-to-slf4j + 2.0.13 + org.testng testng diff --git a/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java index 6317011e..49aedeb7 100644 --- a/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java +++ b/tck/logs/src/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java @@ -49,7 +49,7 @@ public static WebArchive createDeployment() { .addAsServiceProvider(ConfigurableLogRecordExporterProvider.class, InMemoryLogRecordExporterProvider.class) .addAsResource(new StringAsset( - "otel.sdk.disabled=false\notel.metrics.exporter=\notel.traces.exporter=none\notel.logs.exporter=in-memory"), + "otel.sdk.disabled=false\notel.metrics.exporter=none\notel.traces.exporter=none\notel.logs.exporter=otlp"), "META-INF/microprofile-config.properties") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); } @@ -71,6 +71,7 @@ void julTest() throws InterruptedException { SLF4JBridgeHandler.removeHandlersForRootLogger(); SLF4JBridgeHandler.install(); julLogger.info("A JUL log message"); + System.out.println(openTelemetry); Assert.assertEquals(memoryExporter.getFinishedLogRecordItems(1).get(0).getBody(), "A JUL log message"); } }