Commit 2436e325 authored by Hiro's avatar Hiro 🏄
Browse files

Merge branch... 

Merge branch '40040-modify-bridgepool-assignments-processor-and-increment-document-version' into 'master'

Resolve "Modify bridgepool assignments processor and increment document version"

Closes #40040

See merge request tpo/network-health/metrics/collector!8
parents b95f8571 b0b06c97

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ build.properties 
/index/



/.idea/

.iml

.gitlab-ci.yml

+18 −18
Original line number Diff line number Diff line 
variables:

  GIT_STRATEGY: clone

  JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"



stages:

  - test



test:

  stage: test

 image: debian:buster

  image:

    name: debian:bookworm

    pull_policy: always # available: always, if-not-present, never

  script:

    - apt update

  - apt install -y wget apt-transport-https gnupg

  - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -

  - echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb buster main" | tee /etc/apt/sources.list.d/adoptopenjdk.list

    - apt install -y wget apt-transport-https gpg

    - wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null

    - echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list

    - apt update

  - apt install -y adoptopenjdk-8-hotspot ant ivy git

    - apt install -y temurin-11-jdk ant ivy git

    - git submodule init

    - git submodule update

    - ant -lib /usr/share/java resolve

build.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ 
  <property name="jarincludes" value="collector.properties logback.xml" />



  <patternset id="runtime" >

      <include name="commons-codec-1.10.jar"/>

      <include name="commons-codec-1.15.jar"/>

      <include name="commons-compress-1.13.jar"/>

      <include name="jackson-annotations-2.8.6.jar"/>

      <include name="jackson-core-2.8.6.jar"/>

      <include name="jackson-databind-2.8.6.jar"/>

      <include name="xz-1.6.jar"/>

      <include name="metrics-lib-${metricslibversion}-thin.jar"/>

      <include name="logback-core-1.1.9.jar" />

      <include name="logback-classic-1.1.9.jar" />

      <include name="logback-core-1.2.3.jar" />

      <include name="logback-classic-1.2.3.jar" />

      <include name="slf4j-api-1.7.22.jar" />

  </patternset>

build @ 467f5e13

Compare c5d7511a to 467f5e13
Original line number Diff line number Diff line 
Subproject commit c5d7511a7300dd535d368ccb3390b52bff453534
 
Subproject commit 467f5e132c71b9dbbcdc2513927a742f6b1e43a1

src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain { 
  private String formatSanitizedAssignments(LocalDateTime published,

      SortedMap<String, String> sanitizedAssignments) {

    StringBuilder sb = new StringBuilder();

    sb.append("@type bridge-pool-assignment 1.0\n");

    sb.append("@type bridge-pool-assignment 1.1\n");

    sb.append(String.format("bridge-pool-assignment %s\n",

        published.format(this.assignmentFormat)));

    for (Map.Entry<String, String> e : sanitizedAssignments.entrySet()) {