[jena] branch master updated (f16cc35 -> f74435f)

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git.


    from f16cc35  Merge pull request #555 from afs/combined-notice
     new 3c79dbe  Proof of concept for prometheus endpoint
     new 61f4c73  Merge remote-tracking branch 'origin/master'
     new 17d2d31  Change over to using micrometer
     new 96a3af0  Move out prometheus stuff to an extras module
     new f769e09  Merge branch 'master' of https://github.com/apache/jena
     new 0800418  Don't bother with root tag
     new 9d92b22  Change ExtraAction to interface2
     new e209ede  fix compile error
     new d8b71c1  Merge branch 'master' of https://github.com/apache/jena
     new ac464c9  Merge branch 'master' of https://github.com/apache/jena
     new 6f20526  Changes based on @afs comments
     new e2ba3cc  resolve merge conflicts
     new 8b9edf3  Remove extras/prometheus module, fold into jena-fuseki-core
     new c38b46b  Oops forgot prometheus dependency
     new 509bc08  Gah... add micrometer-prometheus in dependencyManagement section
     new fef9827  Return 501 error properly in SimpleMetricsProvider
     new 9cff0cd  Add rudimentary test for metrics
     new 7614a5a  Merge branch 'master' of https://github.com/apache/jena
     new 99e8280  Go back to invoking super.doCommon()
     new 192c84f  Oops didn't mean to leave this commented out
     new 0eed4f4  Add test to suite, record success before write
     new 4577051  Merge remote-tracking branch 'core-project/master'
     new e307980  Remove unused file
     new 7679ebc  Added license info for LatencyUtils and HdrHistogram
     new f74435f  Merge pull request #534 from seaninryan/master

The 7795 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 jena-fuseki2/LICENSE                               | 12 +++-
 jena-fuseki2/jena-fuseki-core/pom.xml              | 11 +++
 .../DataValidator.java => ctl/ActionMetrics.java}  | 27 +++++---
 .../jena/fuseki/metrics/FusekiRequestsMetrics.java | 64 ++++++++++++++++++
 .../jena/fuseki/metrics/MetricsProvider.java       | 11 +--
 .../fuseki/metrics/MetricsProviderRegistry.java    | 32 +++------
 .../fuseki/metrics/SimpleMetricsProvider.java}     | 26 ++++----
 .../fuseki/metrics/prometheus/InitPrometheus.java  | 17 +++--
 .../prometheus/PrometheusMetricsProvider.java      | 78 ++++++++++++++++++++++
 .../fuseki/server/DataAccessPointRegistry.java     | 12 +++-
 .../org.apache.jena.sys.JenaSubsystemLifecycle     |  1 +
 .../org/apache/jena/fuseki/main/FusekiServer.java  | 22 ++++--
 .../org/apache/jena/fuseki/main/JettyServer.java   | 11 ++-
 .../jena/fuseki/webapp/FusekiServerListener.java   | 15 +++--
 .../org/apache/jena/fuseki/webapp/shiro.ini        |  5 +-
 .../src/main/webapp/WEB-INF/web.xml                | 10 +++
 .../org/apache/jena/fuseki/TS_FusekiWebapp.java    |  1 +
 .../java/org/apache/jena/fuseki/TestMetrics.java   | 68 +++++++++++++++++++
 pom.xml                                            | 19 +++++-
 19 files changed, 357 insertions(+), 85 deletions(-)
 copy jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/{validation/DataValidator.java => ctl/ActionMetrics.java} (58%)
 create mode 100644 jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/FusekiRequestsMetrics.java
 copy jena-arq/src/main/java/org/apache/jena/sparql/core/describe/DescribeHandlerFactory.java => jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/MetricsProvider.java (76%)
 copy jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple2.java => jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/MetricsProviderRegistry.java (60%)
 copy jena-fuseki2/{jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/AccessCtl_SPARQL_GSP_R.java => jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/SimpleMetricsProvider.java} (61%)
 copy jena-text-es/src/main/java/org/apache/jena/query/text/es/InitJenaTextES.java => jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/prometheus/InitPrometheus.java (74%)
 create mode 100644 jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/prometheus/PrometheusMetricsProvider.java
 create mode 100644 jena-fuseki2/jena-fuseki-core/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle
 create mode 100644 jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestMetrics.java