Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

split telemetry container bucket #30481

Draft
wants to merge 2 commits into
base: integration
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/autoFVT*
lib/*
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>io.openliberty.microprofile.telemetry.1.0.internal.agent_fat</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
compileErrorAction=build
eclipse.preferences.version=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#Wed Aug 17 16:19:12 BST 2011
eclipse.preferences.version=1
encoding/<project>=UTF-8

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
cleanup.add_default_serial_version_id=false
cleanup.add_generated_serial_version_id=true
cleanup.add_missing_annotations=true
cleanup.add_missing_deprecated_annotations=true
cleanup.add_missing_methods=false
cleanup.add_missing_nls_tags=false
cleanup.add_missing_override_annotations=true
cleanup.add_missing_override_annotations_interface_methods=true
cleanup.add_serial_version_id=false
cleanup.always_use_blocks=true
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
cleanup.convert_to_enhanced_for_loop=false
cleanup.correct_indentation=true
cleanup.format_source_code=false
cleanup.format_source_code_changes_only=false
cleanup.make_local_variable_final=false
cleanup.make_parameters_final=true
cleanup.make_private_fields_final=false
cleanup.make_type_abstract_if_missing_method=false
cleanup.make_variable_declarations_final=false
cleanup.never_use_blocks=false
cleanup.never_use_parentheses_in_expressions=true
cleanup.organize_imports=false
cleanup.qualify_static_field_accesses_with_declaring_class=false
cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
cleanup.remove_unnecessary_casts=true
cleanup.remove_unnecessary_nls_tags=true
cleanup.remove_unused_imports=true
cleanup.remove_unused_local_variables=false
cleanup.remove_unused_private_fields=true
cleanup.remove_unused_private_members=false
cleanup.remove_unused_private_methods=true
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=false
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=false
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_profile
formatter_settings_version=22
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=false
org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=java;javax;org;com;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} IBM Corporation and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-2.0/\n * \n * SPDX-License-Identifier\: EPL-2.0\n *******************************************************************************/</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/** {@inheritDoc} */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n// Do you need FFDC here? Remember FFDC instrumentation and @FFDCIgnore\n// https\://websphere.pok.ibm.com/~alpine/secure/docs/dev/API/com.ibm.ws.ras/com/ibm/ws/ffdc/annotation/FFDCIgnore.html\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
sp_cleanup.add_missing_override_annotations_interface_methods=true
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=true
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=true
sp_cleanup.remove_unused_imports=true
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.jboss.ide.eclipse.as.core.singledeployable.deployableList=
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#*******************************************************************************
# Copyright (c) 2022, 2024 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
#*******************************************************************************
-include= ~../cnf/resources/bnd/bundle.props
bVersion=1.0

src: \
fat/src

fat.project: true

#Any changes to these names must be copied to TestConstants
fat.test.container.images: \
jaegertracing/all-in-one:1.54

grpcVersion=1.57.2

tested.features:\
cdi-2.0,\
cdi-1.2,\
cdi-4.1,\
concurrent-1.0,\
concurrent-3.1,\
concurrent-3.0,\
mpTelemetry-1.1,\
mpTelemetry-1.0,\
mpTelemetry-2.0,\
mpConfig-3.1,\
mpConfig-2.0,\
mpConfig-1.3,\
mpRestClient-2.0,\
mpRestClient-1.1,\
mpRestclient-4.0,\
noship-1.0,\
jaxrs-2.1,\
jaxrs-2.0,\
jsonp-1.1,\
jsonp-1.0,\
restfulWS-3.1,\
restfulWS-4.0,\
restfulwsclient-4.0,\
servlet-3.1,\
servlet-6.0,\
servlet-6.1,\
servlet-4.0

-buildpath: \
io.openliberty.microprofile.telemetry.internal_fat.common,\
com.ibm.websphere.javaee.jaxrs.2.0;version=latest,\
com.ibm.websphere.javaee.cdi.1.2;version=latest,\
com.ibm.websphere.javaee.annotation.1.3;version=latest,\
com.ibm.websphere.javaee.jsonp.1.1;version=latest,\
io.openliberty.jakarta.cdi.4.0;version=latest,\
io.openliberty.jakarta.restfulWS.3.1;version=latest,\
com.ibm.websphere.org.eclipse.microprofile.rest.client.1.1;version=latest,\
io.openliberty.io.opentelemetry;version=latest,\
io.openliberty.io.opentelemetry.2.0;version=latest,\
io.openliberty.org.testcontainers;version=latest,\
io.openliberty.io.opentracing.opentracing-api.0.33.0;version=latest,\
io.grpc:grpc-api;version='${grpcVersion}',\
io.grpc:grpc-core;version='${grpcVersion}',\
io.grpc:grpc-context;version='${grpcVersion}',\
io.grpc:grpc-protobuf;version='${grpcVersion}',\
io.grpc:grpc-protobuf-lite;version='${grpcVersion}',\
io.grpc:grpc-stub;version='${grpcVersion}',\
com.ibm.ws.com.google.guava;version=latest,\
io.openliberty.io.netty;version=latest,\
com.google.protobuf:protobuf-java;version='3.19.2',\
com.google.protobuf:protobuf-java-util;version='3.19.2',\
com.ibm.ws.io.reactivex.rxjava.2.2;version=latest,\
com.ibm.websphere.org.reactivestreams.reactive-streams.1.0,\
io.openliberty.com.google.gson;version=latest,\
com.ibm.ws.org.osgi.annotation.versioning;version=latest,\
io.openliberty.io.opentelemetry.2.0.jakarta
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/*******************************************************************************
* Copyright (c) 2022, 2024 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
*******************************************************************************/
apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'

def grpcVersion='1.57.2'

configurations {
telemetryAgent
telemetryAgent129
telemetryAgent210
jaegerClient
}

dependencies {
requiredLibs 'io.grpc:grpc-api:' + grpcVersion
requiredLibs 'io.grpc:grpc-core:' + grpcVersion
requiredLibs 'io.grpc:grpc-context:' + grpcVersion
requiredLibs 'io.grpc:grpc-netty:' + grpcVersion
requiredLibs 'io.grpc:grpc-protobuf:' + grpcVersion
requiredLibs 'io.grpc:grpc-protobuf-lite:' + grpcVersion
requiredLibs 'io.grpc:grpc-stub:' + grpcVersion
requiredLibs 'com.google.protobuf:protobuf-java:3.19.2'
requiredLibs 'com.google.protobuf:protobuf-java-util:3.19.2'
requiredLibs 'io.opentelemetry:opentelemetry-api:1.19.0'
requiredLibs 'io.opentelemetry:opentelemetry-semconv:1.19.0-alpha'
requiredLibs 'io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha'
requiredLibs 'io.perfmark:perfmark-api:0.23.0'
requiredLibs 'com.google.guava:failureaccess:1.0.1'
requiredLibs project(':com.ibm.ws.com.google.guava')
requiredLibs project(':io.openliberty.io.netty')
requiredLibs project(':com.ibm.ws.io.reactivex.rxjava.2.2')
requiredLibs project(':com.ibm.websphere.org.reactivestreams.reactive-streams.1.0')
requiredLibs project(':io.openliberty.microprofile.telemetry.internal_fat.common')

telemetryAgent 'io.opentelemetry.javaagent:opentelemetry-javaagent:1.19.0'

telemetryAgent129 'io.opentelemetry.javaagent:opentelemetry-javaagent:1.29.0'

telemetryAgent210 'io.opentelemetry.javaagent:opentelemetry-javaagent:2.0.0'

// Jaeger Client is needed for testing with mpOpenTracing-3.0
jaegerClient 'io.opentracing:opentracing-util:0.33.0'
jaegerClient 'io.opentracing:opentracing-noop:0.33.0'
jaegerClient 'io.jaegertracing:jaeger-core:1.6.0'
jaegerClient 'io.jaegertracing:jaeger-thrift:1.6.0'
jaegerClient 'io.jaegertracing:jaeger-client:1.6.0'
jaegerClient 'io.jaegertracing:jaeger-tracerresolver:1.6.0'
jaegerClient 'org.apache.thrift:libthrift:0.14.1'
jaegerClient project(':com.ibm.ws.org.slf4j.api')
jaegerClient project(':com.ibm.ws.org.slf4j.simple')
jaegerClient project(':io.openliberty.com.google.gson')
jaegerClient 'com.squareup.okio:okio-jvm:3.0.0'
jaegerClient 'com.squareup.okhttp3:okhttp:4.10.0'
jaegerClient 'org.jetbrains.kotlin:kotlin-stdlib:1.6.20'
jaegerClient 'org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20'
}

task addAgent(type: Copy) {
from configurations.telemetryAgent
into new File(autoFvtDir, 'publish/files/agent-119')
rename { 'opentelemetry-javaagent.jar' }
}

task addAgent129(type: Copy) {
from configurations.telemetryAgent129
into new File(autoFvtDir, 'publish/files/agent-129')
rename { 'opentelemetry-javaagent.jar' }
}


task addAgent210(type: Copy) {
from configurations.telemetryAgent210
into new File(autoFvtDir, 'publish/files/agent-210')
rename { 'opentelemetry-javaagent.jar' }
}

addRequiredLibraries.dependsOn copyTestContainers
addRequiredLibraries.dependsOn addJakartaTransformer
addRequiredLibraries.dependsOn addAgent
addRequiredLibraries.dependsOn addAgent129
addRequiredLibraries.dependsOn addAgent210
Loading