OBS-URL: https://build.opensuse.org/package/show/Java:packages/prometheus-simpleclient-java?expand=0&rev=17
This commit is contained in:
Git OBS Bridge
commit
595061919b
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
3
parent-0.12.0.tar.gz
Normal file
3
parent-0.12.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3af29c69665f247af08f1d60a7bdcf83c18cfe272a572f697a87ce015ce7067d
|
||||
size 217803
|
||||
3
parent-0.8.0.tar.gz
Normal file
3
parent-0.8.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4e2567d9b6baaa2043d0487ab8d9524a266519be3b4848a41a80ad2a74915a9a
|
||||
size 162801
|
||||
40
prometheus-simpleclient-java.changes
Normal file
40
prometheus-simpleclient-java.changes
Normal file
@ -0,0 +1,40 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 19 11:10:30 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Do not require maven-javadoc-plugin that we don't use
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 9 14:47:22 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Reproducible builds: use SOURCE_DATE_EPOCH for timestamp
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 30 09:44:55 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build against the standalone JavaEE modules inconditionally
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 23 10:00:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build with source and target levels 8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 17 12:56:51 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build against standalone jaxb-api on distributions that have JDK
|
||||
without the JavaEE modules
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 22 18:22:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Do not build against the log4j12 packages
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 11 17:47:28 UTC 2021 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Do not build against the legacy guava version
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 28 07:15:42 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Initial packaging of prometheus-simpleclient-java 0.8.0
|
||||
246
prometheus-simpleclient-java.spec
Normal file
246
prometheus-simpleclient-java.spec
Normal file
@ -0,0 +1,246 @@
|
||||
#
|
||||
# spec file for package prometheus-simpleclient-java
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%global version_id parent
|
||||
%global upstream_name client_java
|
||||
Name: prometheus-simpleclient-java
|
||||
Version: 0.12.0
|
||||
Release: 0
|
||||
Summary: Prometheus Java Suite
|
||||
License: Apache-2.0 AND CC0-1.0
|
||||
URL: https://github.com/prometheus/client_java/
|
||||
Source0: https://github.com/prometheus/client_java/archive/%{version_id}-%{version}.tar.gz
|
||||
Patch1: remove_opentelemetry_tracer.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(ch.qos.logback:logback-classic)
|
||||
BuildRequires: mvn(com.google.guava:guava)
|
||||
BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api)
|
||||
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
||||
BuildRequires: mvn(javax.xml.bind:jaxb-api)
|
||||
BuildRequires: mvn(log4j:log4j)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache.logging.log4j:log4j-core)
|
||||
BuildRequires: mvn(org.eclipse.jetty:jetty-server)
|
||||
BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
The Prometheus Java Suite: Client Metrics, Exposition, and Examples.
|
||||
|
||||
%package parent
|
||||
Summary: Prometheus Java Suite parent pom
|
||||
|
||||
%description parent
|
||||
The Prometheus Java Suite: Client Metrics, Exposition, and Examples.
|
||||
|
||||
%package bom
|
||||
Summary: Prometheus Java Simpleclient BOM
|
||||
|
||||
%description bom
|
||||
Bill of Materials for the Simpleclient.
|
||||
|
||||
%package common
|
||||
Summary: Prometheus Java Simpleclient Common
|
||||
|
||||
%description common
|
||||
Common code used by various modules of the Simpleclient.
|
||||
|
||||
%package graphite_bridge
|
||||
Summary: Prometheus Java Simpleclient Graphite Bridge
|
||||
|
||||
%description graphite_bridge
|
||||
Graphite bridge for the Prometheus Java Simpleclient.
|
||||
|
||||
%package guava
|
||||
Summary: Prometheus Java Simpleclient guava
|
||||
|
||||
%description guava
|
||||
Metrics collector for guava based caches.
|
||||
|
||||
%package hotspot
|
||||
Summary: Prometheus Java Simpleclient Hotspot
|
||||
|
||||
%description hotspot
|
||||
Collectors of data from Java Hotspot.
|
||||
|
||||
%package httpserver
|
||||
Summary: Prometheus Java Simpleclient Httpserver
|
||||
|
||||
%description httpserver
|
||||
Httpserver exposition for the simpleclient.
|
||||
|
||||
%package jetty
|
||||
Summary: Prometheus Java Simpleclient Jetty
|
||||
|
||||
%description jetty
|
||||
Collector of data from Jetty StatisticsHandler.
|
||||
|
||||
%package jetty_jdk8
|
||||
Summary: Prometheus Java Simpleclient Jetty JDK 8
|
||||
|
||||
%description jetty_jdk8
|
||||
Collector of data from Jetty Statistics for Jetty versions which require JDK 8.
|
||||
|
||||
%package log4j
|
||||
Summary: Prometheus Java Simpleclient log4j
|
||||
|
||||
%description log4j
|
||||
Metrics collector for log4j appender logging.
|
||||
|
||||
%package log4j2
|
||||
Summary: Prometheus Java Simpleclient log4j2
|
||||
|
||||
%description log4j2
|
||||
Metrics collector for log4j2 appender logging.
|
||||
|
||||
%package logback
|
||||
Summary: Prometheus Java Simpleclient logback
|
||||
|
||||
%description logback
|
||||
Metrics collector for logback appender logging.
|
||||
|
||||
%package pushgateway
|
||||
Summary: Prometheus Java Simpleclient Pushgateway
|
||||
|
||||
%description pushgateway
|
||||
Pushgateway exporter for the simpleclient.
|
||||
|
||||
%package servlet
|
||||
Summary: Prometheus Java Simpleclient Servlet (javax)
|
||||
|
||||
%description servlet
|
||||
HTTP servlet exporter for the simpleclient (Javax API).
|
||||
|
||||
%package servlet-common
|
||||
Summary: Prometheus Java Simpleclient Servlet
|
||||
|
||||
%description servlet-common
|
||||
HTTP servlet exporter for the simpleclient.
|
||||
|
||||
%package servlet-jakarta
|
||||
Summary: Prometheus Java Simpleclient Servlet (jakarta)
|
||||
|
||||
%description servlet-jakarta
|
||||
HTTP servlet exporter for the simpleclient (Jakarta API).
|
||||
|
||||
%package tracer
|
||||
Summary: Prometheus Java Span Context Supplier - Parent
|
||||
|
||||
%description tracer
|
||||
Prometheus Java Span Context Supplier - Parent POM.
|
||||
|
||||
%package tracer-common
|
||||
Summary: Prometheus Java Span Context Supplier - Common
|
||||
|
||||
%description tracer-common
|
||||
Prometheus Java Span Context Supplier - Common.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package contains javadoc for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{upstream_name}-%{version_id}-%{version}
|
||||
|
||||
# Remove included jar files
|
||||
find . -name \*.jar -print0 | xargs -0 rm
|
||||
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
%pom_remove_plugin :maven-release-plugin
|
||||
%pom_remove_plugin :maven-deploy-plugin
|
||||
%pom_remove_plugin :maven-javadoc-plugin
|
||||
|
||||
for m in simpleclient_caffeine \
|
||||
simpleclient_dropwizard \
|
||||
simpleclient_hibernate \
|
||||
simpleclient_spring_web \
|
||||
simpleclient_spring_boot \
|
||||
simpleclient_vertx \
|
||||
integration_tests \
|
||||
benchmarks; do
|
||||
%pom_disable_module $m
|
||||
done
|
||||
# Only build simpleclient_tracer_common as it's being used by an Examplar class
|
||||
%pom_disable_module simpleclient_tracer_otel_agent simpleclient_tracer
|
||||
%pom_disable_module simpleclient_tracer_otel simpleclient_tracer
|
||||
|
||||
# remove OpenTelemetry stuff, which we don't support
|
||||
%patch -P1 -p2
|
||||
%pom_remove_dep io.prometheus:simpleclient_tracer_otel simpleclient
|
||||
%pom_remove_dep io.prometheus:simpleclient_tracer_otel_agent simpleclient
|
||||
%pom_add_dep io.prometheus:simpleclient_tracer_common:%{version} simpleclient
|
||||
|
||||
# Change compiler source/target version to JDK 8 level
|
||||
%pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" "1.8" pom.xml
|
||||
%pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" "1.8" pom.xml
|
||||
|
||||
%build
|
||||
%{mvn_build} -f -s
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
%files -f .mfiles-simpleclient
|
||||
%license LICENSE
|
||||
%doc NOTICE
|
||||
|
||||
%files parent -f .mfiles-parent
|
||||
|
||||
%files bom -f .mfiles-simpleclient_bom
|
||||
|
||||
%files common -f .mfiles-simpleclient_common
|
||||
|
||||
%files graphite_bridge -f .mfiles-simpleclient_graphite_bridge
|
||||
|
||||
%files guava -f .mfiles-simpleclient_guava
|
||||
|
||||
%files hotspot -f .mfiles-simpleclient_hotspot
|
||||
|
||||
%files httpserver -f .mfiles-simpleclient_httpserver
|
||||
|
||||
%files jetty -f .mfiles-simpleclient_jetty
|
||||
|
||||
%files jetty_jdk8 -f .mfiles-simpleclient_jetty_jdk8
|
||||
|
||||
%files log4j -f .mfiles-simpleclient_log4j
|
||||
|
||||
%files log4j2 -f .mfiles-simpleclient_log4j2
|
||||
|
||||
%files logback -f .mfiles-simpleclient_logback
|
||||
|
||||
%files pushgateway -f .mfiles-simpleclient_pushgateway
|
||||
|
||||
%files servlet -f .mfiles-simpleclient_servlet
|
||||
|
||||
%files servlet-common -f .mfiles-simpleclient_servlet_common
|
||||
|
||||
%files servlet-jakarta -f .mfiles-simpleclient_servlet_jakarta
|
||||
|
||||
%files tracer -f .mfiles-simpleclient_tracer
|
||||
|
||||
%files tracer-common -f .mfiles-simpleclient_tracer_common
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE
|
||||
%doc NOTICE
|
||||
|
||||
%changelog
|
||||
49
remove_opentelemetry_tracer.patch
Normal file
49
remove_opentelemetry_tracer.patch
Normal file
@ -0,0 +1,49 @@
|
||||
diff --git a/client_java-parent-0.12.0/simpleclient/src/main/java/io/prometheus/client/exemplars/Tracer.java b/client_java-parent-0.12.0/simpleclient/src/main/java/io/prometheus/client/exemplars/Tracer.java
|
||||
index 97ec4f4..0686268 100644
|
||||
--- a/client_java-parent-0.12.0/simpleclient/src/main/java/io/prometheus/client/exemplars/Tracer.java
|
||||
+++ b/client_java-parent-0.12.0/simpleclient/src/main/java/io/prometheus/client/exemplars/Tracer.java
|
||||
@@ -1,44 +1,14 @@
|
||||
package io.prometheus.client.exemplars;
|
||||
|
||||
-import io.prometheus.client.exemplars.tracer.common.SpanContextSupplier;
|
||||
-import io.prometheus.client.exemplars.tracer.otel.OpenTelemetrySpanContextSupplier;
|
||||
-import io.prometheus.client.exemplars.tracer.otel_agent.OpenTelemetryAgentSpanContextSupplier;
|
||||
-
|
||||
class Tracer {
|
||||
|
||||
ExemplarSampler initExemplarSampler() {
|
||||
- try {
|
||||
- Object spanContextSupplier = findSpanContextSupplier();
|
||||
- if (spanContextSupplier != null) {
|
||||
- return new DefaultExemplarSampler((SpanContextSupplier) spanContextSupplier);
|
||||
- }
|
||||
- } catch (NoClassDefFoundError ignored) {
|
||||
- // simpleclient_tracer_common dependency not found
|
||||
- }
|
||||
return null;
|
||||
}
|
||||
|
||||
// Avoid SpanContextSupplier in the method signature so that we can handle the NoClassDefFoundError
|
||||
// even if the user excluded simpleclient_tracer_common from the classpath.
|
||||
private Object findSpanContextSupplier() {
|
||||
- try {
|
||||
- if (OpenTelemetrySpanContextSupplier.isAvailable()) {
|
||||
- return new OpenTelemetrySpanContextSupplier();
|
||||
- }
|
||||
- } catch (NoClassDefFoundError ignored) {
|
||||
- // tracer_otel dependency not found
|
||||
- } catch (UnsupportedClassVersionError ignored) {
|
||||
- // OpenTelemetry requires Java 8, but client_java might run on Java 6.
|
||||
- }
|
||||
- try {
|
||||
- if (OpenTelemetryAgentSpanContextSupplier.isAvailable()) {
|
||||
- return new OpenTelemetryAgentSpanContextSupplier();
|
||||
- }
|
||||
- } catch (NoClassDefFoundError ignored) {
|
||||
- // tracer_otel_agent dependency not found
|
||||
- } catch (UnsupportedClassVersionError ignored) {
|
||||
- // OpenTelemetry requires Java 8, but client_java might run on Java 6.
|
||||
- }
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user