Update docker-image.yml

Updated supported tags

.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 SPRING_PROFILES=release
 #zookeeper information required
 PINPOINT_ZOOKEEPER_ADDRESS=zoo1
@@ -135,8 +135,12 @@ COLLECTOR_TCP_PORT=9994
 COLLECTOR_STAT_PORT=9995
 COLLECTOR_SPAN_PORT=9996
 
-# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
+# Sampling Configurations
-PROFILER_SAMPLING_RATE=1
+PROFILER_SAMPLING_TYPE=COUNTING
+PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=1
+PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=100
+PROFILER_SAMPLING_NEW_THROUGHPUT=0
+PROFILER_SAMPLING_CONTINUE_THROUGHPUT=0
 
 AGENT_ID=app-in-docker
 APP_NAME=quickapp

.github/workflows/docker-image.yml

@@ -27,9 +27,13 @@ jobs:
         with:
           username: ${{ secrets.docker_username }}
           password: ${{ secrets.docker_token }}
-      
+          
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+             
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
+        
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v3
@@ -40,7 +44,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./${{ inputs.component }}
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Readme.md

@@ -13,6 +13,8 @@ It supports and helps you understand your application in a glance and allow you
 
 ## Supported Tags
 
+ - 2.4.1
+ - 2.4.0
  - 2.3.3
  - 2.3.2
  - 2.3.1
@@ -158,7 +160,7 @@ You can also easily change the log level from *.env* file.
  
 ## Any Issues or Suggestions?
 
-Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint/issues).
+Feel free to share any problems and suggestions via [Pinpoint GitHub Issue page](https://github.com/pinpoint-apm/pinpoint-docker/issues).
 Contributions on the pinpoint-docker image is also always welcome.
 
 ## License

docker-compose.yml

@@ -238,7 +238,11 @@ services:
       - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}
       - PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}
       - PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}
-      - PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
+      - PROFILER_SAMPLING_TYPE=${PROFILER_SAMPLING_TYPE}
+      - PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}
+      - PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}
+      - PROFILER_SAMPLING_NEW_THROUGHPUT=${PROFILER_SAMPLING_NEW_THROUGHPUT}
+      - PROFILER_SAMPLING_CONTINUE_THROUGHPUT=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}
       - DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
       - PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
     depends_on:
@@ -246,7 +250,7 @@ services:
 
   #zookeepers
   zoo1:
-    image: zookeeper:3.4
+    image: zookeeper:3.4.13
     restart: always
     hostname: zoo1
     expose:
@@ -262,7 +266,7 @@ services:
       - pinpoint
 
   zoo2:
-    image: zookeeper:3.4
+    image: zookeeper:3.4.13
     restart: always
     hostname: zoo2
     expose:
@@ -278,7 +282,7 @@ services:
       - pinpoint
 
   zoo3:
-    image: zookeeper:3.4
+    image: zookeeper:3.4.13
     restart: always
     hostname: zoo3
     expose:

pinpoint-agent-attach-example/java/.env

@@ -1,5 +1,20 @@
 ### Pinpoint with Java
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 SPRING_PROFILES=release
-AGENT_ID=app-in-docker
+AGENT_ID=java-app-in-docker
-APP_NAME=quickapp
+APP_NAME=JavaAttachExample
+
+
+#collector information required
+COLLECTOR_IP=
+PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=9991
+PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=9991
+PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=9992
+PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=9993
+
+# Sampling configurations
+PROFILER_SAMPLING_TYPE=COUNTING
+PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=1
+PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=100
+PROFILER_SAMPLING_NEW_THROUGHPUT=0
+PROFILER_SAMPLING_CONTINUE_THROUGHPUT=0

pinpoint-agent-attach-example/tomcat/.env

@@ -1,5 +1,5 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 SPRING_PROFILES=release
 APP_PORT=8085
 AGENT_ID=app-in-docker

pinpoint-agent/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.3.3
+PINPOINT_VERSION=2.4.1
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent
@@ -18,8 +18,28 @@ COLLECTOR_TCP_PORT=9994
 COLLECTOR_STAT_PORT=9995
 COLLECTOR_SPAN_PORT=9996
 
-# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
+# Profiler Sampling Configurations
-PROFILER_SAMPLING_RATE=1
+# If this value set to COUNTING(default), sampling rate is 1/n.
+# If this value set to PERCENT, sampling rate is n%.
+PROFILER_SAMPLING_TYPE=COUNTING
+
+# depend on profiler.samplging.rate.type,
+
+# if it's COUNTING(the default), then 1 out of n transactions will be sampled where n is the rate.
+# eg. 1: 100%     20: 5%     50: 2%      100: 1%
+PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=1
+
+# if it's PERCENT, then first x transactions out of y transactions will be sampled.
+# Support from 100% to 0.01%
+# eg. 100: 100%    50: 50%   5: 5%  0.01: 0.01%
+PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=100
+
+# Permits per second, if throughput is 0, it is unlimited.
+# "New" is a transaction that is newly traced.
+PROFILER_SAMPLING_NEW_THROUGHPUT=0
+# "Continue" is a transaction that is already being tracked.
+PROFILER_SAMPLING_CONTINUE_THROUGHPUT=0
+
 
 AGENT_ID=app-in-docker
 APP_NAME=quickapp

pinpoint-agent/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.7
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
 
 COPY /build/scripts/configure-agent.sh /usr/local/bin/

pinpoint-agent/Readme.md

@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.4.1
  - 2.4.0
  - 2.3.3
  - 2.3.2

pinpoint-agent/build/scripts/configure-agent.sh

@@ -16,7 +16,11 @@ sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSP
 sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
 sed -i "/profiler.transport.grpc.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
 sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
-sed -i "/profiler.sampling.rate=/ s/=.*/=${PROFILER_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+sed -i "/profiler.sampling.type=/ s/=.*/=${PROFILER_SAMPLING_TYPE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+sed -i "/profiler.sampling.counting.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+sed -i "/profiler.sampling.percent.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+sed -i "/profiler.sampling.new.throughput=/ s/=.*/=${PROFILER_SAMPLING_NEW_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+sed -i "/profiler.sampling.continue.throughput=/ s/=.*/=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
 
 sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j2.xml
 

pinpoint-agent/docker-compose.yml

@@ -22,7 +22,11 @@ services:
       - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}
       - PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}
       - PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}
-      - PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
+      - PROFILER_SAMPLING_TYPE=${PROFILER_SAMPLING_TYPE}
+      - PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}
+      - PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}
+      - PROFILER_SAMPLING_NEW_THROUGHPUT=${PROFILER_SAMPLING_NEW_THROUGHPUT}
+      - PROFILER_SAMPLING_CONTINUE_THROUGHPUT=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}
       - DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
       - PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
     networks:

pinpoint-batch/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 SPRING_PROFILES=release
 
 ### Pinpoint-Batch

pinpoint-batch/Dockerfile

@@ -1,6 +1,6 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar
 
 RUN mkdir -p /pinpoint/config \
@@ -9,7 +9,7 @@ RUN mkdir -p /pinpoint/config \
 COPY /build/config/pinpoint-batch.properties /pinpoint/config/
 COPY /build/scripts/start-batch.sh /pinpoint/scripts/
 
-RUN apk --no-cache add curl \
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
     && chmod a+x /pinpoint/scripts/start-batch.sh \
     && chmod a+x /pinpoint/config/pinpoint-batch.properties \
     && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-batch.jar

pinpoint-batch/Readme.md

@@ -4,28 +4,8 @@ This Docker image contains the Pinpoint Batch component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.4.1
  - 2.4.0
- - 2.3.3
- - 2.3.2
- - 2.3.1
- - 2.3.0
- - 2.2.2
- - 2.2.1
- - 2.2.0
- - 2.1.2
- - 2.1.0
- - 2.0.4
- - 2.0.3
- - 2.0.2
- - 2.0.1
- - 1.8.5 
- - 1.8.4
- - 1.8.3
- - 1.8.2
- - 1.8.1
- - 1.8.0
- - 1.7.3
- - 1.7.2
  
 Please see the [Pinpoint-Docker GitHub repository](https://github.com/pinpoint-apm/pinpoint-docker) for further information on how to run, configure and build this image.
 

pinpoint-collector/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 SPRING_PROFILES=release
 
 ### Pinpoint-Collector

pinpoint-collector/Dockerfile

@@ -1,6 +1,6 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
 
 RUN mkdir -p /pinpoint/config \
@@ -9,9 +9,9 @@ RUN mkdir -p /pinpoint/config \
 COPY /build/config/pinpoint-collector.properties /pinpoint/config/
 COPY /build/scripts/start-collector.sh /pinpoint/scripts/
 #temporary line for local test
-#COPY /pinpoint-collector-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
+#COPY /pinpoint-collector-boot-2.4.1-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
 
-RUN apk --no-cache add curl \
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
     && chmod a+x /pinpoint/scripts/start-collector.sh \
     && chmod a+x /pinpoint/config/pinpoint-collector.properties \
     && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar

pinpoint-collector/Readme.md

@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
 
 ## Supported Tags
 
+ - 2.4.1
  - 2.4.0
  - 2.3.3
  - 2.3.2

pinpoint-flink/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 
 ### Pinpoint-flink
 

pinpoint-flink/Dockerfile

@@ -1,5 +1,5 @@
-FROM flink:1.14.2
+FROM flink:1.14-java11
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar
 
 RUN apt-get update \

pinpoint-flink/Readme.md

@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Flink component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.4.1
  - 2.4.0
  - 2.3.3
  - 2.3.2

pinpoint-flink/build/profiles/release/hbase.properties

@@ -14,6 +14,8 @@ hbase.ipc.client.tcpnodelay=true
 hbase.rpc.timeout=10000
 # hbase default:Integer.MAX_VALUE
 hbase.client.operation.timeout=10000
+# hbase default: 20m
+hbase.client.meta.operation.timeout=10000
 
 # hbase socket read timeout. default: 200000
 hbase.ipc.client.socket.timeout.read=20000

pinpoint-hbase/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 
 ### Pinpoint-Hbase
 

pinpoint-hbase/Dockerfile

@@ -1,6 +1,6 @@
-FROM java:8-jdk
+FROM openjdk:8u342-slim
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
 
 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
 ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
@@ -14,7 +14,8 @@ COPY hbase-env.sh hbase-env.sh
 COPY /build/scripts/initialize-hbase.sh /usr/local/bin/
 COPY /build/scripts/check-table.sh /usr/local/bin/
 
-RUN chmod a+x /usr/local/bin/initialize-hbase.sh \
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
+    && chmod a+x /usr/local/bin/initialize-hbase.sh \
     && chmod a+x /usr/local/bin/check-table.sh \
     && mkdir -p ${BASE_DIR} \
     && cd ${BASE_DIR} \

pinpoint-hbase/Readme.md

@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.4.1
  - 2.4.0
  - 2.3.3
  - 2.3.2

pinpoint-mysql/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 
 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123

pinpoint-mysql/Dockerfile

@@ -1,11 +1,8 @@
-FROM mysql:5.7
+FROM mysql:8.0
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
 
-RUN apt update \ 
+RUN curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" -o /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \
-	&& apt-get install -y --no-install-recommends ca-certificates wget \
+	&& curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" -o /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \
-	&& wget -O /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" \
-	&& wget -O /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" \
 	&& sed -i '/^--/d' /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \
-	&& sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \
+	&& sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql
-	&& apt-get purge -y --auto-remove ca-certificates wget

pinpoint-mysql/Readme.md

@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.4.1
  - 2.4.0
  - 2.3.3
  - 2.3.2

pinpoint-quickstart/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent
@@ -12,8 +12,12 @@ PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=9991
 PROFILER_TRANSPORT_STAT_COLLECTOR_PORT=9992
 PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT=9993
 
-# Set sampling rate. If you set it to N, 1 out of N transaction will be sampled.
+# Sampling Configurations
-PROFILER_SAMPLING_RATE=1
+PROFILER_SAMPLING_TYPE=COUNTING
+PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=1
+PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=100
+PROFILER_SAMPLING_NEW_THROUGHPUT=0
+PROFILER_SAMPLING_CONTINUE_THROUGHPUT=0
 
 AGENT_ID=app-in-docker
 APP_NAME=quickapp

pinpoint-quickstart/Dockerfile

@@ -4,6 +4,8 @@ COPY /build/pinpoint-quickstart-testapp.war quickstart.war
 
 RUN rm -rf /usr/local/tomcat/webapps \
     && mkdir -p /usr/local/tomcat/webapps \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y unzip\
     && unzip quickstart.war -d /usr/local/tomcat/webapps/ROOT \
     && rm -rf quickstart.war
 

pinpoint-quickstart/Readme.md

@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Quickstart sample to test Pinpoint appli
 
 ## Supported Tags
 
+ - 2.4.1
  - 2.4.0
  - 2.3.3
  - 2.3.2

pinpoint-quickstart/docker-compose.yml

@@ -40,7 +40,11 @@ services:
       - COLLECTOR_TCP_PORT=${COLLECTOR_TCP_PORT}
       - COLLECTOR_STAT_PORT=${COLLECTOR_STAT_PORT}
       - COLLECTOR_SPAN_PORT=${COLLECTOR_SPAN_PORT}
-      - PROFILER_SAMPLING_RATE=${PROFILER_SAMPLING_RATE}
+      - PROFILER_SAMPLING_TYPE=${PROFILER_SAMPLING_TYPE} 
+      - PROFILER_SAMPLING_COUNTING_SAMPLING_RATE=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}
+      - PROFILER_SAMPLING_PERCENT_SAMPLING_RATE=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}
+      - PROFILER_SAMPLING_NEW_THROUGHPUT=${PROFILER_SAMPLING_NEW_THROUGHPUT}
+      - PROFILER_SAMPLING_CONTINUE_THROUGHPUT=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}
       - DEBUG_LEVEL=${AGENT_DEBUG_LEVEL}
 
 volumes:

pinpoint-web/.env

@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.0
+PINPOINT_VERSION=2.4.1
 SPRING_PROFILES=release
 
 ### Pinpoint-Web

pinpoint-web/Dockerfile

@@ -1,6 +1,6 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.1}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
 
 RUN mkdir -p /pinpoint/config \
@@ -9,9 +9,9 @@ RUN mkdir -p /pinpoint/config \
 COPY /build/config/pinpoint-web.properties /pinpoint/config/
 COPY /build/scripts/start-web.sh /pinpoint/scripts/
 #temporary line for local test
-#COPY /pinpoint-web-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
+#COPY /pinpoint-web-boot-2.4.1-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
 
-RUN apk --no-cache add curl \
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
     && chmod a+x /pinpoint/scripts/start-web.sh \
     && chmod a+x /pinpoint/config/pinpoint-web.properties \
     && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar

pinpoint-web/Readme.md

@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
 
 ## Supported Tags
 
+ - 2.4.1
  - 2.4.0
  - 2.3.3
  - 2.3.2