mirror of
https://github.com/datahub-project/datahub.git
synced 2025-12-10 17:46:02 +00:00
fix(verions): Update opentelemetry and updates from pr-5239 (#6563)
This commit is contained in:
david-leifker
GitHub
parent
42ee2f3729
commit
ef9a280ba4
@ -120,7 +120,7 @@ project.ext.externalDependency = [
|
||||
'opentelemetryApi': 'io.opentelemetry:opentelemetry-api:' + openTelemetryVersion,
|
||||
'opentelemetryAnnotations': 'io.opentelemetry:opentelemetry-extension-annotations:' + openTelemetryVersion,
|
||||
'opentracingJdbc':'io.opentracing.contrib:opentracing-jdbc:0.2.15',
|
||||
'parquet': 'org.apache.parquet:parquet-avro:1.12.2',
|
||||
'parquet': 'org.apache.parquet:parquet-avro:1.12.3',
|
||||
'picocli': 'info.picocli:picocli:4.5.0',
|
||||
'playCache': 'com.typesafe.play:play-cache_2.12:2.7.6',
|
||||
'playEhcache': 'com.typesafe.play:play-ehcache_2.12:2.7.6',
|
||||
|
||||
@ -45,7 +45,7 @@ RUN cd datahub-src \
|
||||
FROM base as prod-install
|
||||
COPY --from=prod-build /datahub-frontend /datahub-frontend/
|
||||
COPY ./docker/monitoring/client-prometheus-config.yaml /datahub-frontend/
|
||||
RUN wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.4.1/opentelemetry-javaagent-all.jar -O opentelemetry-javaagent-all.jar \
|
||||
RUN wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.18.0/opentelemetry-javaagent.jar -O opentelemetry-javaagent.jar \
|
||||
&& wget https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar -O jmx_prometheus_javaagent.jar
|
||||
RUN chown -R datahub:datahub /datahub-frontend && chmod 755 /datahub-frontend
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ fi
|
||||
|
||||
OTEL_AGENT=""
|
||||
if [[ ${ENABLE_OTEL:-false} == true ]]; then
|
||||
OTEL_AGENT="-javaagent:/opentelemetry-javaagent-all.jar"
|
||||
OTEL_AGENT="-javaagent:/opentelemetry-javaagent.jar"
|
||||
fi
|
||||
|
||||
TRUSTSTORE_FILE=""
|
||||
|
||||
@ -19,7 +19,7 @@ RUN apk --no-cache --update-cache --available upgrade \
|
||||
&& curl -sS https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.46.v20220331/jetty-runner-9.4.46.v20220331.jar --output jetty-runner.jar \
|
||||
&& curl -sS https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-jmx/9.4.46.v20220331/jetty-jmx-9.4.46.v20220331.jar --output jetty-jmx.jar \
|
||||
&& curl -sS https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.4.46.v20220331/jetty-util-9.4.46.v20220331.jar --output jetty-util.jar \
|
||||
&& wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.4.1/opentelemetry-javaagent-all.jar \
|
||||
&& wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.18.0/opentelemetry-javaagent.jar \
|
||||
&& wget --no-verbose https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar -O jmx_prometheus_javaagent.jar \
|
||||
&& cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks \
|
||||
&& curl -sS -L https://github.com/treff7es/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-${DOCKERIZE_ARCH}-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv
|
||||
|
||||
@ -45,7 +45,7 @@ fi
|
||||
|
||||
OTEL_AGENT=""
|
||||
if [[ $ENABLE_OTEL == true ]]; then
|
||||
OTEL_AGENT="-javaagent:opentelemetry-javaagent-all.jar "
|
||||
OTEL_AGENT="-javaagent:opentelemetry-javaagent.jar "
|
||||
fi
|
||||
|
||||
PROMETHEUS_AGENT=""
|
||||
|
||||
@ -16,7 +16,7 @@ RUN apk --no-cache --update-cache --available upgrade \
|
||||
fi \
|
||||
&& apk --no-cache add tar curl bash coreutils \
|
||||
&& apk --no-cache add openjdk11-jre --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
|
||||
&& wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.4.1/opentelemetry-javaagent-all.jar \
|
||||
&& wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.18.0/opentelemetry-javaagent.jar \
|
||||
&& wget --no-verbose https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar -O jmx_prometheus_javaagent.jar \
|
||||
&& cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks \
|
||||
&& curl -sSL https://github.com/treff7es/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-${DOCKERIZE_ARCH}-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv
|
||||
|
||||
@ -36,7 +36,7 @@ fi
|
||||
|
||||
JAVA_TOOL_OPTIONS="${JDK_JAVA_OPTIONS:-}${JAVA_OPTS:+ $JAVA_OPTS}${JMX_OPTS:+ $JMX_OPTS}"
|
||||
if [[ ${ENABLE_OTEL:-false} == true ]]; then
|
||||
JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -javaagent:opentelemetry-javaagent-all.jar"
|
||||
JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -javaagent:opentelemetry-javaagent.jar"
|
||||
fi
|
||||
if [[ ${ENABLE_PROMETHEUS:-false} == true ]]; then
|
||||
JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -javaagent:jmx_prometheus_javaagent.jar=4318:/datahub/datahub-mae-consumer/scripts/prometheus-config.yaml"
|
||||
|
||||
@ -16,7 +16,7 @@ RUN apk --no-cache --update-cache --available upgrade \
|
||||
fi \
|
||||
&& apk --no-cache add tar curl bash \
|
||||
&& apk --no-cache add openjdk11-jre --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
|
||||
&& wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.4.1/opentelemetry-javaagent-all.jar \
|
||||
&& wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.18.0/opentelemetry-javaagent.jar \
|
||||
&& wget --no-verbose https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar -O jmx_prometheus_javaagent.jar \
|
||||
&& cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks \
|
||||
&& curl -sSL https://github.com/treff7es/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-${DOCKERIZE_ARCH}-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv
|
||||
|
||||
@ -7,7 +7,7 @@ fi
|
||||
|
||||
OTEL_AGENT=""
|
||||
if [[ $ENABLE_OTEL == true ]]; then
|
||||
OTEL_AGENT="-javaagent:opentelemetry-javaagent-all.jar "
|
||||
OTEL_AGENT="-javaagent:opentelemetry-javaagent.jar "
|
||||
fi
|
||||
|
||||
PROMETHEUS_AGENT=""
|
||||
|
||||
@ -17,7 +17,7 @@ RUN apk --no-cache --update-cache --available upgrade \
|
||||
&& curl -sS https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.46.v20220331/jetty-runner-9.4.46.v20220331.jar --output jetty-runner.jar \
|
||||
&& curl -sS https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-jmx/9.4.46.v20220331/jetty-jmx-9.4.46.v20220331.jar --output jetty-jmx.jar \
|
||||
&& curl -sS https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.4.46.v20220331/jetty-util-9.4.46.v20220331.jar --output jetty-util.jar \
|
||||
&& wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.4.1/opentelemetry-javaagent-all.jar \
|
||||
&& wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.18.0/opentelemetry-javaagent.jar \
|
||||
&& wget --no-verbose https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar -O jmx_prometheus_javaagent.jar \
|
||||
&& cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks \
|
||||
&& curl -sSL https://github.com/treff7es/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-${DOCKERIZE_ARCH}-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv
|
||||
|
||||
@ -112,7 +112,6 @@ shadowJar {
|
||||
relocate 'com.sun.jna', 'datahub.shaded.com.sun.jna'
|
||||
// Below jars added for kafka emitter only
|
||||
relocate 'org.apache.avro', 'datahub.shaded.org.apache.avro'
|
||||
relocate 'org.codehaus.jackson', 'datahub.shaded.org.codehaus.jackson'
|
||||
relocate 'com.thoughtworks.paranamer', 'datahub.shaded.com.thoughtworks.paranamer'
|
||||
relocate 'org.xerial.snappy', 'datahub.shaded.org.xerial.snappy'
|
||||
relocate 'org.apache.kafka', 'datahub.shaded.org.apache.kafka'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user